Merge pull request #48 from daiktas/master

update conda
LLPDNNX · Aug 26, 2019 · b073466 · b073466
2 parents 4974c34 + 973f850
commit b073466
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/Env/environment_cpu.yml b/Env/environment_cpu.yml
@@ -2,7 +2,8 @@ name: tf_cpu
 channels:
  - conda-forge
 dependencies:
- - root==6.16
+ - python==2.7.15
+ - root==6.18.00
  - pyyaml==3.12
  - h5py==2.7.1
  - scipy==1.0.0

diff --git a/Env/environment_gpu.yml b/Env/environment_gpu.yml
@@ -2,7 +2,8 @@ name: tf_gpu
 channels:
  - conda-forge
 dependencies:
- - root==6.16
+ - python==2.7.15
+ - root==6.18.00
  - pyyaml==3.12
  - h5py==2.7.1
  - scipy==1.0.0

diff --git a/Env/setupEnvCPU.sh b/Env/setupEnvCPU.sh
@@ -44,8 +44,8 @@ function run_setup()
         return 1
     fi
 
-    wget -P $INSTALL_ABSDIR https://repo.continuum.io/miniconda/Miniconda2-4.3.31-Linux-x86_64.sh &>> $LOGFILE || return 1
-    bash $INSTALL_ABSDIR/Miniconda2-4.3.31-Linux-x86_64.sh -b -s -p $INSTALL_ABSDIR/miniconda &>> $LOGFILE || return 1
+    wget -P $INSTALL_ABSDIR https://repo.continuum.io/miniconda/Miniconda2-4.7.10-Linux-x86_64.sh &>> $LOGFILE || return 1
+    bash $INSTALL_ABSDIR/Miniconda2-4.7.10-Linux-x86_64.sh -b -s -p $INSTALL_ABSDIR/miniconda &>> $LOGFILE || return 1
 
     CONDA_BIN=$INSTALL_ABSDIR/miniconda/bin
     export PATH=$CONDA_BIN:$PATH
@@ -59,7 +59,7 @@ function run_setup()
 
     echo "Create environment for CPU"
 
-    conda env create -f $SCRIPT_DIR/environment_cpu.yml -q python=2.7 &>> $LOGFILE || return 1
+    conda env create -f $SCRIPT_DIR/environment_cpu.yml -q &>> $LOGFILE || return 1
     source activate tf_cpu
     conda list
     source deactivate &>> $LOGFILE || return 1

diff --git a/Env/setupEnvFull.sh b/Env/setupEnvFull.sh
@@ -44,8 +44,8 @@ function run_setup()
         return 1
     fi
 
-    wget -P $INSTALL_ABSDIR https://repo.continuum.io/miniconda/Miniconda2-4.3.31-Linux-x86_64.sh &>> $LOGFILE || return 1
-    bash $INSTALL_ABSDIR/Miniconda2-4.3.31-Linux-x86_64.sh -b -s -p $INSTALL_ABSDIR/miniconda &>> $LOGFILE || return 1
+    wget -P $INSTALL_ABSDIR https://repo.continuum.io/miniconda/Miniconda2-4.7.10-Linux-x86_64.sh &>> $LOGFILE || return 1
+    bash $INSTALL_ABSDIR/Miniconda2-4.7.10-Linux-x86_64.sh -b -s -p $INSTALL_ABSDIR/miniconda &>> $LOGFILE || return 1
 
     CONDA_BIN=$INSTALL_ABSDIR/miniconda/bin
     export PATH=$CONDA_BIN:$PATH
@@ -59,7 +59,7 @@ function run_setup()
 
     echo "Create environment for CPU"
 
-    conda env create -f $SCRIPT_DIR/environment_cpu.yml -q python=2.7 &>> $LOGFILE || return 1
+    conda env create -f $SCRIPT_DIR/environment_cpu.yml -q &>> $LOGFILE || return 1
     source activate tf_cpu
     conda list
     source deactivate &>> $LOGFILE || return 1
@@ -75,15 +75,15 @@ function run_setup()
 
     echo "Create environment for GPU"
 
-    conda env create -f $SCRIPT_DIR/environment_gpu.yml -q python=2.7 &>> $LOGFILE || return 1
+    conda env create -f $SCRIPT_DIR/environment_gpu.yml -q &>> $LOGFILE || return 1
     source activate tf_gpu
     conda list
     source deactivate &>> $LOGFILE || return 1
 
     echo "Generate setup script"
     echo "export PATH="$INSTALL_ABSDIR"/miniconda/bin:\$PATH" > $SCRIPT_DIR/env_gpu.sh
     echo "source activate tf_gpu" >> $SCRIPT_DIR/env_gpu.sh
-    echo "export LD_LIBRARY_PATH="$INSTALL_ABSDIR"/miniconda/envs/tf_cpu/x86_64-conda_cos6-linux-gnu/lib:\$LD_LIBRARY_PATH" >> $SCRIPT_DIR/env_gpu.sh
+    echo "export LD_LIBRARY_PATH="$INSTALL_ABSDIR"/miniconda/envs/tf_gpu/x86_64-conda_cos6-linux-gnu/lib:\$LD_LIBRARY_PATH" >> $SCRIPT_DIR/env_gpu.sh
     echo "export TF_CPP_MIN_LOG_LEVEL=2" >> $SCRIPT_DIR/env_gpu.sh
     echo "export OMP_NUM_THREADS=16 #reduce further if out-of-memory" >> $SCRIPT_DIR/env_gpu.sh
     echo "ulimit -s unlimited" >> $SCRIPT_DIR/env_gpu.sh