From cfaadcc402626cdc75e54a10aebc5a1e4ca23783 Mon Sep 17 00:00:00 2001 From: Jan Vogelsang <47158055+JanVogelsang@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:13:02 +0200 Subject: [PATCH 1/6] Update common --- plans/nest-simulator/common | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plans/nest-simulator/common b/plans/nest-simulator/common index d7eb5d0..76e1173 100755 --- a/plans/nest-simulator/common +++ b/plans/nest-simulator/common @@ -95,12 +95,6 @@ module_install () { #-e "s%\${\?PYTHON_SITEPKG}\?%$PYTHON_SITEPKG%g" \ fi - if [[ "${CMAKEFLAGS}" == *"python=ON"* ]]; then - PYTHON_SITEPKG="$(python -c "import sysconfig; from pathlib import Path; print(Path(sysconfig.get_path('purelib')).relative_to(sysconfig.get_path('data')))")" - PYTHON_SITEPKG=${PYTHON_SITEPKG#"lib/"} - sed -i "s|.*PYTHONPATH.*|&$PYTHON_SITEPKG|" "$module_path" - fi - if ! echo "${MODULEPATH:-}" | grep "${MODULE_INSTALL_PATH}" >/dev/null; then log_info ">>>" log_info ">>> Info: MODULE_INSTALL_PATH is not in your MODULEPATH" From db8575c862d94578b01c9323ad6e9388bc4ee6a2 Mon Sep 17 00:00:00 2001 From: Jan Vogelsang <47158055+JanVogelsang@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:15:32 +0200 Subject: [PATCH 2/6] Update default.module --- plans/nest-simulator/2.20.0/default.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/nest-simulator/2.20.0/default.module b/plans/nest-simulator/2.20.0/default.module index d7efe11..3f62dd2 100644 --- a/plans/nest-simulator/2.20.0/default.module +++ b/plans/nest-simulator/2.20.0/default.module @@ -45,12 +45,12 @@ setenv NEST_DATA_DIR \$INSTALLDIR/share/nest setenv NEST_DOC_DIR \$INSTALLDIR/share/doc/nest # The path where NEST looks for user modules. -setenv NEST_MODULE_PATH \$INSTALLDIR/lib64/nest +setenv NEST_MODULE_PATH [glob -directory \$INSTALLDIR/ -type d lib*/nest/] # The path where the PyNEST bindings are installed. setenv NEST_PYTHON_PREFIX \$INSTALLDIR -prepend-path PYTHONPATH \$INSTALLDIR/lib64/ +prepend-path PYTHONPATH [glob -directory \$INSTALLDIR/ -type d lib*/python*/site-packages/] prepend-path PATH \$INSTALLDIR/bin #prepend-path LD_LIBRARY_PATH \$INSTALLDIR/lib64 #prepend-path MANPATH \$INSTALLDIR/man From 1d4130c2e6be730c0eee0120ab6d3eb13adb0396 Mon Sep 17 00:00:00 2001 From: Jan Vogelsang <47158055+JanVogelsang@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:28:06 +0200 Subject: [PATCH 3/6] Update default.module --- plans/nest-simulator/2.20.1/default.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/nest-simulator/2.20.1/default.module b/plans/nest-simulator/2.20.1/default.module index d7efe11..3f62dd2 100644 --- a/plans/nest-simulator/2.20.1/default.module +++ b/plans/nest-simulator/2.20.1/default.module @@ -45,12 +45,12 @@ setenv NEST_DATA_DIR \$INSTALLDIR/share/nest setenv NEST_DOC_DIR \$INSTALLDIR/share/doc/nest # The path where NEST looks for user modules. -setenv NEST_MODULE_PATH \$INSTALLDIR/lib64/nest +setenv NEST_MODULE_PATH [glob -directory \$INSTALLDIR/ -type d lib*/nest/] # The path where the PyNEST bindings are installed. setenv NEST_PYTHON_PREFIX \$INSTALLDIR -prepend-path PYTHONPATH \$INSTALLDIR/lib64/ +prepend-path PYTHONPATH [glob -directory \$INSTALLDIR/ -type d lib*/python*/site-packages/] prepend-path PATH \$INSTALLDIR/bin #prepend-path LD_LIBRARY_PATH \$INSTALLDIR/lib64 #prepend-path MANPATH \$INSTALLDIR/man From 6a909f104995666fd062f4e844dc7ab17fc91eb1 Mon Sep 17 00:00:00 2001 From: Jan Vogelsang <47158055+JanVogelsang@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:28:40 +0200 Subject: [PATCH 4/6] Update default.module --- plans/nest-simulator/3.0/default.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/nest-simulator/3.0/default.module b/plans/nest-simulator/3.0/default.module index d7efe11..3f62dd2 100644 --- a/plans/nest-simulator/3.0/default.module +++ b/plans/nest-simulator/3.0/default.module @@ -45,12 +45,12 @@ setenv NEST_DATA_DIR \$INSTALLDIR/share/nest setenv NEST_DOC_DIR \$INSTALLDIR/share/doc/nest # The path where NEST looks for user modules. -setenv NEST_MODULE_PATH \$INSTALLDIR/lib64/nest +setenv NEST_MODULE_PATH [glob -directory \$INSTALLDIR/ -type d lib*/nest/] # The path where the PyNEST bindings are installed. setenv NEST_PYTHON_PREFIX \$INSTALLDIR -prepend-path PYTHONPATH \$INSTALLDIR/lib64/ +prepend-path PYTHONPATH [glob -directory \$INSTALLDIR/ -type d lib*/python*/site-packages/] prepend-path PATH \$INSTALLDIR/bin #prepend-path LD_LIBRARY_PATH \$INSTALLDIR/lib64 #prepend-path MANPATH \$INSTALLDIR/man From a226384226a8aa0045a199c66fd7b2d77db93622 Mon Sep 17 00:00:00 2001 From: Jan Vogelsang <47158055+JanVogelsang@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:29:00 +0200 Subject: [PATCH 5/6] Update default.module --- plans/nest-simulator/3.1/default.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/nest-simulator/3.1/default.module b/plans/nest-simulator/3.1/default.module index d7efe11..3f62dd2 100644 --- a/plans/nest-simulator/3.1/default.module +++ b/plans/nest-simulator/3.1/default.module @@ -45,12 +45,12 @@ setenv NEST_DATA_DIR \$INSTALLDIR/share/nest setenv NEST_DOC_DIR \$INSTALLDIR/share/doc/nest # The path where NEST looks for user modules. -setenv NEST_MODULE_PATH \$INSTALLDIR/lib64/nest +setenv NEST_MODULE_PATH [glob -directory \$INSTALLDIR/ -type d lib*/nest/] # The path where the PyNEST bindings are installed. setenv NEST_PYTHON_PREFIX \$INSTALLDIR -prepend-path PYTHONPATH \$INSTALLDIR/lib64/ +prepend-path PYTHONPATH [glob -directory \$INSTALLDIR/ -type d lib*/python*/site-packages/] prepend-path PATH \$INSTALLDIR/bin #prepend-path LD_LIBRARY_PATH \$INSTALLDIR/lib64 #prepend-path MANPATH \$INSTALLDIR/man From f6d9c847613263e36f7d0185cfe7f8b2998b8ec1 Mon Sep 17 00:00:00 2001 From: Jan Vogelsang <47158055+JanVogelsang@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:29:26 +0200 Subject: [PATCH 6/6] Update default.module --- plans/nest-simulator/master/default.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/nest-simulator/master/default.module b/plans/nest-simulator/master/default.module index d7efe11..3f62dd2 100644 --- a/plans/nest-simulator/master/default.module +++ b/plans/nest-simulator/master/default.module @@ -45,12 +45,12 @@ setenv NEST_DATA_DIR \$INSTALLDIR/share/nest setenv NEST_DOC_DIR \$INSTALLDIR/share/doc/nest # The path where NEST looks for user modules. -setenv NEST_MODULE_PATH \$INSTALLDIR/lib64/nest +setenv NEST_MODULE_PATH [glob -directory \$INSTALLDIR/ -type d lib*/nest/] # The path where the PyNEST bindings are installed. setenv NEST_PYTHON_PREFIX \$INSTALLDIR -prepend-path PYTHONPATH \$INSTALLDIR/lib64/ +prepend-path PYTHONPATH [glob -directory \$INSTALLDIR/ -type d lib*/python*/site-packages/] prepend-path PATH \$INSTALLDIR/bin #prepend-path LD_LIBRARY_PATH \$INSTALLDIR/lib64 #prepend-path MANPATH \$INSTALLDIR/man