Skip to content
Snippets Groups Projects
Commit 85fd624d authored by Thomas Purcell's avatar Thomas Purcell
Browse files

Merge branch 'master' of gitlab.mpcdf.mpg.de:tpurcell/cpp_sisso into nl_opt_parameterization

parents 45695a2c cb8a8109
Branches
No related tags found
No related merge requests found
...@@ -81,10 +81,12 @@ test-intel-bin: ...@@ -81,10 +81,12 @@ test-intel-bin:
- export LD_LIBRARY_PATH=$I_MPI_ROOT/lib/:$I_MPI_ROOT/lib/release:$MKLROOT/lib/intel64:$INTEL_COMP_ROOT/lib/:$INTEL_COMP_ROOT/compiler/lib/intel64/:$LD_LIBRARY_PATH:$HOME/intel/oneapi/intelpython/latest/lib/:$HOME/intel/oneapi/intelpython/latest/lib/python3.7 - export LD_LIBRARY_PATH=$I_MPI_ROOT/lib/:$I_MPI_ROOT/lib/release:$MKLROOT/lib/intel64:$INTEL_COMP_ROOT/lib/:$INTEL_COMP_ROOT/compiler/lib/intel64/:$LD_LIBRARY_PATH:$HOME/intel/oneapi/intelpython/latest/lib/:$HOME/intel/oneapi/intelpython/latest/lib/python3.7
- export PYTHONPATH=$HOME/intel/oneapi/intelpython/latest/lib/python3.7/site-packages/:cpp_sisso_env/lib/python3.7/site-packages/ - export PYTHONPATH=$HOME/intel/oneapi/intelpython/latest/lib/python3.7/site-packages/:cpp_sisso_env/lib/python3.7/site-packages/
- export PATH=$INTEL_COMP_ROOT/bin/:$INTEL_COMP_ROOT/bin/intel64:$I_MPI_ROOT/bin:$PATH - export PATH=$INTEL_COMP_ROOT/bin/:$INTEL_COMP_ROOT/bin/intel64:$I_MPI_ROOT/bin:$PATH
- export OMP_NUM_THREADS=2 - export OMP_NUM_THREADS=1
- export OMP_PLACES=cores - cd tests/exec_test/default/
- cd tests/exec_test/classification - mpiexec -n 1 ../../../bin/sisso++
- mpiexec -n 2 ../../../bin/sisso++ - python ../check_model.py
- cd ../classification/
- mpiexec -n 1 ../../../bin/sisso++
- python check_model.py - python check_model.py
- cd ../default - cd ../default
- mpiexec -n 2 ../../../bin/sisso++ - mpiexec -n 2 ../../../bin/sisso++
...@@ -162,10 +164,12 @@ test-gnu-bin: ...@@ -162,10 +164,12 @@ test-gnu-bin:
- source cpp_sisso_env/bin/activate - source cpp_sisso_env/bin/activate
- export LD_LIBRARY_PATH=$HOME/intel/oneapi/intelpython/latest/lib/:$HOME/intel/oneapi/intelpython/latest/lib/python3.7:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH=$HOME/intel/oneapi/intelpython/latest/lib/:$HOME/intel/oneapi/intelpython/latest/lib/python3.7:$LD_LIBRARY_PATH
- export PYTHONPATH=$HOME/intel/oneapi/intelpython/latest/lib/python3.7/site-packages/:cpp_sisso_env/lib/python3.7/site-packages/ - export PYTHONPATH=$HOME/intel/oneapi/intelpython/latest/lib/python3.7/site-packages/:cpp_sisso_env/lib/python3.7/site-packages/
- export OMP_NUM_THREADS=2 - export OMP_NUM_THREADS=1
- export OMP_PLACES=cores - cd tests/exec_test/default/
- cd tests/exec_test/classification - mpiexec -n 1 ../../../bin/sisso++
- mpiexec -n 2 ../../../bin/sisso++ - python ../check_model.py
- cd ../classification/
- mpiexec -n 1 ../../../bin/sisso++
- python check_model.py - python check_model.py
- cd ../default - cd ../default
- mpiexec -n 2 ../../../bin/sisso++ - mpiexec -n 2 ../../../bin/sisso++
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment