Cleaned environment files

DIG-Kaust · Aug 25, 2022 · 980f813 · 980f813
1 parent 08fb6ac
commit 980f813
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 70 deletions.
diff --git a/environment.yml b/environment.yml
@@ -4,27 +4,26 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python=3.8.8
+  - python
   - pip
-  - numpy=1.20.1
-  - scipy=1.6.0
-  - cudatoolkit=11.0 
-  - scikit-learn=0.24.1
+  - numpy
+  - scipy=1.7.3
+  - cudatoolkit=11.3
+  - scikit-learn
   - pandas
-  - pylops=1.13.0
+  - pylops
   - matplotlib
   - ipython
   - jupyter
-  - pytorch=1.7.1
-  - torchvision=0.8.2
+  - pytorch
+  - torchvision
   - torchaudio
   - numpydoc
   - tqdm 
   - pip:
-    - pytorch-complex-tensor
-    - cupy-cuda110
+    - cupy-cuda113
     - pylops-gpu==0.0.1
     - torchsummary
     - torchviz
     - pytorch-msssim
-
+    - pytorch-lightning
diff --git a/environment_latest.yml b/environment_latest.yml
diff --git a/install_env.sh b/install_env.sh
@@ -15,10 +15,13 @@ conda activate deepprecs
 conda env list
 echo 'Created and activated environment:' $(which python)
 
+# remove numba (temporary, due to collision with numpy version)
+rm -rf /home/ravasim/miniconda3/envs/deepprecs/lib/python3.10/site-packages/numba*
+
 # install deepprecs package
 pip install -e .
 
-# check cupy works as expected
+# check cupy-torch work as expected
 echo 'Checking cupy version and running a command...'
 python -c 'import cupy as cp; print(cp.__version__); import torch; print(torch.__version__);  print(torch.cuda.get_device_name(torch.cuda.current_device())); print(torch.ones(10).to("cuda:0"))'
 

diff --git a/install_env_latest.sh b/install_env_latest.sh