Skip to content

Commit

Permalink
Merge pull request #46 from nasa/develop
Browse files Browse the repository at this point in the history
Release 0.2.5
  • Loading branch information
marinagmoreira committed May 4, 2022
2 parents c7cd7d7 + 61aac2d commit 3a7bdca
Show file tree
Hide file tree
Showing 93 changed files with 2,420 additions and 401 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/ci_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,8 @@ jobs:
--build-arg UBUNTU_VERSION=20.04
--build-arg ROS_VERSION=noetic
--build-arg PYTHON=3
-t isaac/isaac:msgs-ubuntu20.04
-t isaac/isaac:msgs-ubuntu20.04

- name: Build analyst image isaac/isaac:msgs-ubuntu20.04
run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile
-t isaac/isaac_analyst_notebook:latest
7 changes: 7 additions & 0 deletions .github/workflows/ci_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,12 @@ jobs:
--build-arg REMOTE=ghcr.io/nasa
-t ghcr.io/${{ github.repository_owner }}/isaac:msgs-ubuntu20.04

- name: Build analyst image isaac/isaac:msgs-ubuntu20.04
run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile
--build-arg REMOTE=ghcr.io/nasa
-t ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest


- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin

Expand All @@ -182,3 +188,4 @@ jobs:
if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac:latest-ubuntu20.04; fi;
if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac:astrobee-msgs-ubuntu20.04; fi;
if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac:msgs-ubuntu20.04; fi;
if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest; fi;
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,11 @@ tags

# Folders
doc/html
doc/latex
doc/latex

# Jupyter Notebooks
analyst/workspace/.ipython
analyst/workspace/.jupyter
analyst/workspace/.local
analyst/workspace/.ipynb_checkpoints
analyst/workspace/.cache
40 changes: 0 additions & 40 deletions DEMO_INSTALL.md

This file was deleted.

6 changes: 2 additions & 4 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Native Install
=====

Usage instructions for non-NASA and NASA users
Machine setup
---------

Install the 64-bit version of [Ubuntu 16.04, 18.04 or 20.04](http://releases.ubuntu.com/)
Expand All @@ -18,10 +18,8 @@ any other operating system or Ubuntu versions.*
*Note: Please ensure you install the 64-bit version of Ubuntu. We do not
support running ISAAC Software on 32-bit systems.*

Machine setup
---------
**The `isaac` repo depends on some `astrobee` packages, therefore, `astrobee` needs to be installed beforehand.**

The `isaac` repo depends on some `astrobee` packages, therefore, `astrobee` needs to be installed beforehand.

Checkout the project source code
---------
Expand Down
6 changes: 6 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Releases

## Release 0.2.5

* Add sci cam plugin to isaac repo
* Soundsee depth tool
* Output standalone panorama survey

## Release 0.2.4

* Inspection tool improvements
Expand Down
4 changes: 4 additions & 0 deletions analyst/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
\page analyst Analyst Notebook


copied into the jupyter notebook home folder, are scripts that are made by the analyst and will be saved, even after the docker is shutdown.
105 changes: 105 additions & 0 deletions analyst/workspace/1_import_bagfiles.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
"cells": [
{
"cell_type": "markdown",
"metadata": {
"tags": []
},
"source": [
"# Import bagfiles to Database for Analysis\n",
"\n",
"The database used is ArangoDB. If you followed the Analyst notebook startup procedure [here](https://nasa.github.io/isaac/html/index.html), the local database should already be hosted in http://localhost:8529.\n",
"\n",
"Go ahead open the link at take a look! The username is `root` and the password `isaac`.\n",
"\n",
"To connect to the database:"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"from pyArango.connection import *\n",
"\n",
"# Connect to the database\n",
"conn = Connection(arangoURL=\"http://iui_arangodb:8529\", username=\"root\", password=\"isaac\")\n",
"\n",
"# Open the isaac database / create it if it does not exist\n",
"if not conn.hasDatabase(\"isaac\"):\n",
" conn.createDatabase(name=\"isaac\")\n",
"db = conn[\"isaac\"]\n",
"\n",
"# Create a collection\n",
"if not db.hasCollection(\"analyst\"):\n",
" db.createCollection(name=\"analyst\")\n",
" \n",
"print(\"Connected to database!\")"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"The next step is to select the bagfile to import"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"from scripts.load_bag_database import LoadBagDatabase\n",
"\n",
"\n",
"path=\"/home/analyst/data/bags/\"\n",
"\n",
"LoadBagDatabase(db, path, \"/gnc/ekf\")"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.10"
}
},
"nbformat": 4,
"nbformat_minor": 4
}
49 changes: 49 additions & 0 deletions analyst/workspace/2_read_from_database.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"cells": [
{
"cell_type": "markdown",
"id": "5636fde2-c963-48b5-a883-a7d520a6084e",
"metadata": {},
"source": [
"# Read Various Data Types from Database"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "23334b94-b585-4319-a75b-eeacece22852",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "9288a825-64f6-4177-9f65-9bff1ea74210",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.10"
}
},
"nbformat": 4,
"nbformat_minor": 5
}
70 changes: 70 additions & 0 deletions analyst/workspace/build_CNN_with_pytorch.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": null,
"id": "1b6a6b4d-99b1-47ca-8cfd-a668539fdab8",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "9df2443f-50cc-49a9-9b4e-2f1018fc6904",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": 1,
"id": "097ce74d-b561-4aa4-b899-8301205457a2",
"metadata": {},
"outputs": [],
"source": [
"from pathlib import Path\n",
"\n",
"import matplotlib.pyplot as plt\n",
"import numpy as np\n",
"import torch\n",
"import torch.nn.functional as F\n",
"import torchvision.transforms as transforms\n",
"from PIL import Image\n",
"from torch import nn, optim\n",
"from torchvision import datasets, models, transforms\n",
"\n",
"\n",
"\n",
"test_transforms = transforms.Compose(\n",
" [\n",
" transforms.Resize(224),\n",
" transforms.ToTensor(),\n",
" transforms.Normalize([0.485, 0.456, 0.406], [0.229, 0.224, 0.225]),\n",
" ]\n",
")"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.7"
}
},
"nbformat": 4,
"nbformat_minor": 5
}
Loading

0 comments on commit 3a7bdca

Please sign in to comment.