Merge pull request #25 from praksharma/development

Docker image build
praksharma · Jun 21, 2023 · 359cc13 · 359cc13
2 parents 6f656ce + 26f2358
commit 359cc13
Show file tree

Hide file tree

Showing 16 changed files with 986 additions and 34 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: true
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -0,0 +1,31 @@
+name: docker_container
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout the repository
+        uses: actions/checkout@v3
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/DeepINN:pre-release
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
       #- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
       #- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
       #- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
-      - name: Check out repository code
+      - name: Check out repository
         uses: actions/checkout@v3
       #- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
       #- run: echo "🖥️ The workflow is now ready to test your code on the runner."

diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,4 @@ docs/_build/
 .vscode/
 
 # Python virtual environment
-.venv/
+.venv/
diff --git a/Tutorials/Basic_domains.ipynb → Tutorials/1. Geometry/Basic_domains.ipynb b/Tutorials/Basic_domains.ipynb → Tutorials/1. Geometry/Basic_domains.ipynb
@@ -8,7 +8,7 @@
    "source": [
     "# This is only valid when the package is not installed\n",
     "import sys\n",
-    "sys.path.append('/home/hell/Desktop/repos/DeepINN/')"
+    "sys.path.append('../../') # two folders up"
    ]
   },
   {

diff --git a/Tutorials/1. Geometry/L_plate.stl b/Tutorials/1. Geometry/L_plate.stl
diff --git a/Tutorials/1. Geometry/UKAEA SUT.ipynb b/Tutorials/1. Geometry/UKAEA SUT.ipynb
diff --git a/Tutorials/1. Geometry/different sampling.ipynb b/Tutorials/1. Geometry/different sampling.ipynb
diff --git a/Tutorials/domain_creation.ipynb → Tutorials/1. Geometry/domain_creation.ipynb b/Tutorials/domain_creation.ipynb → Tutorials/1. Geometry/domain_creation.ipynb
diff --git a/Tutorials/1. Geometry/polygons_external_objects.ipynb b/Tutorials/1. Geometry/polygons_external_objects.ipynb
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -0,0 +1,14 @@
+FROM pytorch/pytorch:latest
+LABEL description="DeepINN with PyTorch and GPU support"
+
+COPY requirements.txt /root
+COPY ../DeepINN /root/
+WORKDIR /root
+RUN /usr/bin/python -m pip install --upgrade pip
+RUN pip3 install -r requirements.txt 
+RUN apt-get update && apt-get install -y --no-install-recommends imagemagick \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+EXPOSE 8888/tcp
+ENV SHELL /bin/bash
+ENTRYPOINT ["jupyter", "notebook", "--ip", "0.0.0.0", "--no-browser", "--allow-root"]
diff --git a/docker/requirements.txt b/docker/requirements.txt
@@ -0,0 +1,12 @@
+ipython
+jupyter
+jupyterlab
+notebook
+matplotlib
+numpy
+scikit-learn
+scikit-optimize
+scipy
+shapely
+trimesh
+rtree
diff --git a/requirements.txt b/requirements.txt
@@ -4,4 +4,6 @@ numpy
 scikit-learn
 scikit-optimize
 scipy
-shapely
+shapely
+trimesh
+rtree
diff --git a/requirements_working.txt b/requirements_working.txt
@@ -0,0 +1,73 @@
+asttokens==2.2.1
+backcall==0.2.0
+cmake==3.26.4
+comm==0.1.3
+contourpy==1.1.0
+cycler==0.11.0
+debugpy==1.6.7
+decorator==5.1.1
+executing==1.2.0
+filelock==3.12.2
+fonttools==4.40.0
+importlib-metadata==6.7.0
+importlib-resources==5.12.0
+ipykernel==6.23.2
+ipython==8.12.2
+jedi==0.18.2
+Jinja2==3.1.2
+joblib==1.2.0
+jupyter_client==8.2.0
+jupyter_core==5.3.1
+kiwisolver==1.4.4
+lit==16.0.6
+MarkupSafe==2.1.3
+matplotlib==3.7.1
+matplotlib-inline==0.1.6
+mpmath==1.3.0
+nest-asyncio==1.5.6
+networkx==3.1
+numpy==1.24.3
+nvidia-cublas-cu11==11.10.3.66
+nvidia-cuda-cupti-cu11==11.7.101
+nvidia-cuda-nvrtc-cu11==11.7.99
+nvidia-cuda-runtime-cu11==11.7.99
+nvidia-cudnn-cu11==8.5.0.96
+nvidia-cufft-cu11==10.9.0.58
+nvidia-curand-cu11==10.2.10.91
+nvidia-cusolver-cu11==11.4.0.1
+nvidia-cusparse-cu11==11.7.4.91
+nvidia-nccl-cu11==2.14.3
+nvidia-nvtx-cu11==11.7.91
+packaging==23.1
+parso==0.8.3
+pexpect==4.8.0
+pickleshare==0.7.5
+Pillow==9.5.0
+platformdirs==3.6.0
+prompt-toolkit==3.0.38
+psutil==5.9.5
+ptyprocess==0.7.0
+pure-eval==0.2.2
+pyaml==23.5.9
+Pygments==2.15.1
+pyparsing==3.1.0
+python-dateutil==2.8.2
+PyYAML==6.0
+pyzmq==25.1.0
+Rtree==1.0.1
+scikit-learn==1.2.2
+scikit-optimize==0.9.0
+scipy==1.10.1
+shapely==2.0.1
+six==1.16.0
+stack-data==0.6.2
+sympy==1.12
+threadpoolctl==3.1.0
+torch==2.0.1
+tornado==6.3.2
+traitlets==5.9.0
+trimesh==3.22.1
+triton==2.0.0
+typing_extensions==4.6.3
+wcwidth==0.2.6
+zipp==3.15.0
diff --git a/test.py b/test.py
@@ -3,9 +3,9 @@
 #print(dp.__version__)
 
 
-print('dp keys ',dp.__dict__.keys())
+#print('dp keys ',dp.__dict__.keys())
 print(dp.__dict__["__about__"])
 
 #print()
 
-print(dp.config.Config)
+#print(dp.config.Config)
diff --git a/test_independent.py b/test_independent.py