Skip to content
Snippets Groups Projects
Commit 66167251 authored by lukas leufen's avatar lukas leufen
Browse files

Merge branch '331-upgrade-code-to-tensorflow-v2' into...

Merge branch '331-upgrade-code-to-tensorflow-v2' into 'lukas_issue331_test_tf2_on_local_system_and_hdfml'

additional netcdf4 version install removed for setup_venv_hdfml.sh and...

See merge request !354
parents 7ae58d39 879757d3
Branches
Tags
6 merge requests!413update release branch,!412Resolve "release v2.0.0",!361name of pdf starts now with feature_importance, there is now also another...,!354additional netcdf4 version install removed for setup_venv_hdfml.sh and...,!350Resolve "upgrade code to TensorFlow V2",!335Resolve "upgrade code to TensorFlow V2"
Pipeline #83247 failed
...@@ -85,7 +85,7 @@ source venv_${hpcsys}/bin/activate ...@@ -85,7 +85,7 @@ source venv_${hpcsys}/bin/activate
timestamp=\`date +"%Y-%m-%d_%H%M-%S"\` timestamp=\`date +"%Y-%m-%d_%H%M-%S"\`
export PYTHONPATH=\${PWD}/venv_${hpcsys}/lib/python3.6/site-packages:\${PYTHONPATH} export PYTHONPATH=\${PWD}/venv_${hpcsys}/lib/python3.8/site-packages:\${PYTHONPATH}
srun --cpu-bind=none python run.py --experiment_date=\$timestamp srun --cpu-bind=none python run.py --experiment_date=\$timestamp
EOT EOT
...@@ -110,7 +110,7 @@ source venv_${hpcsys}/bin/activate ...@@ -110,7 +110,7 @@ source venv_${hpcsys}/bin/activate
timestamp=\`date +"%Y-%m-%d_%H%M-%S"\` timestamp=\`date +"%Y-%m-%d_%H%M-%S"\`
export PYTHONPATH=\${PWD}/venv_${hpcsys}/lib/python3.6/site-packages:\${PYTHONPATH} export PYTHONPATH=\${PWD}/venv_${hpcsys}/lib/python3.8/site-packages:\${PYTHONPATH}
srun --cpu-bind=none python run_HPC.py --experiment_date=\$timestamp srun --cpu-bind=none python run_HPC.py --experiment_date=\$timestamp
EOT EOT
......
...@@ -11,7 +11,7 @@ module use $OTHERSTAGES ...@@ -11,7 +11,7 @@ module use $OTHERSTAGES
ml Stages/2020 ml Stages/2020
ml GCCcore/.10.3.0 ml GCCcore/.10.3.0
# ml Jupyter/2021.3.1-Python-3.8.5 ml Jupyter/2021.3.1-Python-3.8.5
ml Python/3.8.5 ml Python/3.8.5
ml TensorFlow/2.5.0-Python-3.8.5 ml TensorFlow/2.5.0-Python-3.8.5
ml SciPy-Stack/2021-Python-3.8.5 ml SciPy-Stack/2021-Python-3.8.5
......
...@@ -31,13 +31,13 @@ echo "##### FINISH INSTALLING requirements_HDFML_additionals.txt #####" ...@@ -31,13 +31,13 @@ echo "##### FINISH INSTALLING requirements_HDFML_additionals.txt #####"
# pip install --ignore-installed matplotlib==3.2.0 # pip install --ignore-installed matplotlib==3.2.0
# pip install --ignore-installed pandas==1.0.1 # pip install --ignore-installed pandas==1.0.1
# pip install --ignore-installed statsmodels==0.11.1 # pip install --ignore-installed statsmodels==0.11.1
pip install --ignore-installed tabulate # pip install --ignore-installed tabulate
pip install -U typing_extensions # pip install -U typing_extensions
# see wiki on hdfml for information oh h5py: # see wiki on hdfml for information oh h5py:
# https://gitlab.version.fz-juelich.de/haf/Wiki/-/wikis/HDF-ML%20System # https://gitlab.version.fz-juelich.de/haf/Wiki/-/wikis/HDF-ML%20System
export CC=mpicc export CC=mpicc
export HDF5_MPI="ON" export HDF5_MPI="ON"
pip install --no-binary=h5py h5py pip install --no-binary=h5py h5py
pip install --ignore-installed netcdf4==1.5.4 # pip install --ignore-installed netcdf4==1.5.4
...@@ -31,6 +31,6 @@ echo "##### FINISH INSTALLING requirements_JUWELS_additionals.txt #####" ...@@ -31,6 +31,6 @@ echo "##### FINISH INSTALLING requirements_JUWELS_additionals.txt #####"
# pip install --ignore-installed matplotlib==3.2.0 # pip install --ignore-installed matplotlib==3.2.0
# pip install --ignore-installed pandas==1.0.1 # pip install --ignore-installed pandas==1.0.1
pip install -U typing_extensions # pip install -U typing_extensions
# Comment: Maybe we have to export PYTHONPATH a second time ater activating the venv (after job allocation) # Comment: Maybe we have to export PYTHONPATH a second time ater activating the venv (after job allocation)
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
astropy==4.1 astropy==4.1
auto_mix_prep==0.2.0 auto_mix_prep==0.2.0
Cartopy==0.18.0 Cartopy==0.18.0
dask==2021.3.0
dill==0.3.3 dill==0.3.3
keras==2.6.0 keras==2.6.0
keras_nightly==2.5.0.dev2021032900 keras_nightly==2.5.0.dev2021032900
...@@ -10,6 +11,7 @@ mock==4.0.3 ...@@ -10,6 +11,7 @@ mock==4.0.3
numpy==1.19.5 numpy==1.19.5
pandas==1.1.5 pandas==1.1.5
psutil==5.8.0 psutil==5.8.0
pydot==1.4.2
pytest==6.2.2 pytest==6.2.2
requests==2.25.1 requests==2.25.1
scipy==1.5.2 scipy==1.5.2
...@@ -17,6 +19,7 @@ seaborn==0.11.1 ...@@ -17,6 +19,7 @@ seaborn==0.11.1
setuptools==47.1.0 setuptools==47.1.0
six==1.15.0 six==1.15.0
statsmodels==0.12.2 statsmodels==0.12.2
tabulate==0.8.9
tensorflow==2.5.0 tensorflow==2.5.0
typing_extensions==3.7.4.3 typing_extensions==3.7.4.3
wget==3.2 wget==3.2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment