From 7407fa0620bb81aa01b3895325de93c56de39eec Mon Sep 17 00:00:00 2001
From: Hans Fangohr <hans.fangohr@mpsd.mpg.de>
Date: Tue, 27 Jun 2023 08:05:27 +0200
Subject: [PATCH 1/4] Add the location of the octopus configure script in lmod
file
MPSD_OCTOPUS_CONFIGURE
---
README.rst | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/README.rst b/README.rst
index 7a2383a..5b9be9b 100644
--- a/README.rst
+++ b/README.rst
@@ -177,6 +177,24 @@ Requirements for particular toolchains and package sets
- ``foss*-mpi`` currently needs linux header files installed (to compile the ``knem`` package)
- ``foss*-cuda-mpi`` (proably as `*-mpi, needs testing TODO`)
+Finding the Octopus configure script
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For each toolchain, there is a Octopus configure script available. Once the
+toolchain is loaded, the variable ``$MPSD_OCTOPUS_CONFIGURE`` contains that
+path. The path can also be seen using the ``module show TOOLCHAINNAME`` command. For example::
+
+ $ mpsd-software install dev-23a foss2022a-mpi
+ $ module use /home/fangohr/mpsd-software-manager/dev-23a/cascadelake/lmod/Core
+ $ module show toolchains/foss2022a-mpi
+ ...
+ depends_on("cgal/5.0.3")
+ depends_on("hdf5/1.12.2")
+ setenv("MPSD_OCTOPUS_CONFIGURE","/home/fangohr/mpsd-software/dev-23a/spack-environments/octopus/foss2022a-mpi-config.sh")
+ $ module load toolchains/foss2022a-mpi
+ $ echo $MPSD_OCTOPUS_CONFIGURE
+ /home/fangohr/mpsd-software/dev-23a/spack-environments/octopus/foss2022a-mpi-config.sh
+
Working example
~~~~~~~~~~~~~~~
--
GitLab
From 23f9553bb107bb320efa69419049f4ef70093578 Mon Sep 17 00:00:00 2001
From: Hans Fangohr <hans.fangohr@mpsd.mpg.de>
Date: Tue, 27 Jun 2023 08:23:32 +0200
Subject: [PATCH 2/4] Octopus scripts for Octopus toolchains
- keep the option open that we may have a toolchain not designed for Octopus
---
README.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.rst b/README.rst
index 5b9be9b..1ff1004 100644
--- a/README.rst
+++ b/README.rst
@@ -180,7 +180,7 @@ Requirements for particular toolchains and package sets
Finding the Octopus configure script
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-For each toolchain, there is a Octopus configure script available. Once the
+For each Octopus toolchain, there is a Octopus configure script available. Once the
toolchain is loaded, the variable ``$MPSD_OCTOPUS_CONFIGURE`` contains that
path. The path can also be seen using the ``module show TOOLCHAINNAME`` command. For example::
--
GitLab
From 6d4463703f6416cd8abb9597adebed96ad1cf864 Mon Sep 17 00:00:00 2001
From: Ashwin Kumar Karnad <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Tue, 27 Jun 2023 07:18:21 +0000
Subject: [PATCH 3/4] Improvements from Ashwin - thanks!
---
README.rst | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/README.rst b/README.rst
index 1ff1004..bcb6acc 100644
--- a/README.rst
+++ b/README.rst
@@ -177,23 +177,25 @@ Requirements for particular toolchains and package sets
- ``foss*-mpi`` currently needs linux header files installed (to compile the ``knem`` package)
- ``foss*-cuda-mpi`` (proably as `*-mpi, needs testing TODO`)
-Finding the Octopus configure script
+Finding the Octopus configure wrapper
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-For each Octopus toolchain, there is a Octopus configure script available. Once the
+For each Octopus toolchain, there is a Octopus configure wrapper available.
+The wrapper essentially calls the configure script with the right parameters,
+and library locations for the current toolchain. Once the
toolchain is loaded, the variable ``$MPSD_OCTOPUS_CONFIGURE`` contains that
-path. The path can also be seen using the ``module show TOOLCHAINNAME`` command. For example::
+path. The path can also be seen using the ``module show TOOLCHAIN_NAME`` command. For example::
$ mpsd-software install dev-23a foss2022a-mpi
- $ module use /home/fangohr/mpsd-software-manager/dev-23a/cascadelake/lmod/Core
+ $ module use ~/mpsd-software-manager/dev-23a/cascadelake/lmod/Core
$ module show toolchains/foss2022a-mpi
...
depends_on("cgal/5.0.3")
depends_on("hdf5/1.12.2")
- setenv("MPSD_OCTOPUS_CONFIGURE","/home/fangohr/mpsd-software/dev-23a/spack-environments/octopus/foss2022a-mpi-config.sh")
+ setenv("MPSD_OCTOPUS_CONFIGURE","~/mpsd-software/dev-23a/spack-environments/octopus/foss2022a-mpi-config.sh")
$ module load toolchains/foss2022a-mpi
$ echo $MPSD_OCTOPUS_CONFIGURE
- /home/fangohr/mpsd-software/dev-23a/spack-environments/octopus/foss2022a-mpi-config.sh
+ ~/mpsd-software/dev-23a/spack-environments/octopus/foss2022a-mpi-config.sh
Working example
--
GitLab
From 8e95e0423a60228d78ccb1b1c77b0f4c9fd0d296 Mon Sep 17 00:00:00 2001
From: Hans Fangohr <hans.fangohr@mpsd.mpg.de>
Date: Tue, 27 Jun 2023 09:24:51 +0200
Subject: [PATCH 4/4] fix rst syntax
---
README.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.rst b/README.rst
index bcb6acc..5679942 100644
--- a/README.rst
+++ b/README.rst
@@ -178,7 +178,7 @@ Requirements for particular toolchains and package sets
- ``foss*-cuda-mpi`` (proably as `*-mpi, needs testing TODO`)
Finding the Octopus configure wrapper
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
For each Octopus toolchain, there is a Octopus configure wrapper available.
The wrapper essentially calls the configure script with the right parameters,
--
GitLab