Skip to content

Commit 84d3fb4

Browse files
climbfujiclimbfuji
committed
Merge branch 'develop' of https://github.com/jcsda/spack-stack into feature/update_spack_stack_dev_from_spack_a9c879d
2 parents 74ab5d9 + c04874c commit 84d3fb4

File tree

5 files changed

+6
-100
lines changed

5 files changed

+6
-100
lines changed

‎configs/sites/tier1/hercules/compilers.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ compilers:
1010
operating_system: rocky9
1111
target: x86_64
1212
modules:
13-
- spack-managed-x86-64_v3
1413
- intel-oneapi-compilers/2024.2.1
1514
environment:
1615
set:

‎configs/sites/tier1/hercules/packages_oneapi.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ packages:
1515
- spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1
1616
prefix: /apps/spack-managed-x86_64_v3-v1.0/oneapi-2024.2.1/intel-oneapi-mpi-2021.13.1-3pv63eugwmse2xpeglxib4dr2oeb42g2
1717
modules:
18-
- spack-managed-x86-64_v3
1918
- intel-oneapi-compilers/2024.2.1
2019
- intel-oneapi-mpi/2021.13.1
2120

@@ -25,15 +24,13 @@ packages:
2524
- spec: intel-oneapi-mkl@2024.2.1
2625
prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-mkl-2024.2.1-aeiool3i5jj4newwifvkhow5almp67rt
2726
modules:
28-
- spack-managed-x86-64_v3
2927
- intel-oneapi-mkl/2024.2.1
3028

3129
intel-oneapi-runtime:
3230
externals:
3331
- spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
3432
prefix: /apps/spack-managed-x86_64_v3-v1.0/oneapi-2024.2.1/intel-oneapi-runtime-2024.2.1-hl5zgdjaldynq35dq3yotclfy2vblybx
3533
modules:
36-
- spack-managed-x86-64_v3
3734
- intel-oneapi-compilers/2024.2.1
3835
- intel-oneapi-runtime/2024.2.1
3936

‎configs/sites/tier1/orion/compilers.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ compilers:
4141
operating_system: rocky9
4242
target: x86_64
4343
modules:
44-
- spack-managed-x86-64_v3
4544
- intel-oneapi-compilers/2024.2.1
4645
environment:
4746
set:

‎configs/sites/tier1/orion/packages_oneapi.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ packages:
1414
externals:
1515
- spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1
1616
modules:
17-
- spack-managed-x86-64_v3
1817
- intel-oneapi-compilers/2024.2.1
1918
- intel-oneapi-mpi/2021.13.1
2019
prefix: /apps/spack-managed-x86_64_v3-v1.0/oneapi-2024.2.1/intel-oneapi-mpi-2021.13.1-3pv63eugwmse2xpeglxib4dr2oeb42g2
@@ -24,7 +23,6 @@ packages:
2423
externals:
2524
- spec: intel-oneapi-mkl@2024.2.1
2625
modules:
27-
- spack-managed-x86-64_v3
2826
- intel-oneapi-mkl/2024.2.1
2927
prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-mkl-2024.2.1-aeiool3i5jj4newwifvkhow5almp67rt
3028

@@ -33,7 +31,6 @@ packages:
3331
- spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
3432
prefix: /apps/spack-managed-x86_64_v3-v1.0/oneapi-2024.2.1/intel-oneapi-runtime-2024.2.1-hl5zgdjaldynq35dq3yotclfy2vblybx
3533
modules:
36-
- spack-managed-x86-64_v3
3734
- intel-oneapi-compilers/2024.2.1
3835
- intel-oneapi-runtime/2024.2.1
3936

‎doc/source/PreConfiguredSites.rst‎

Lines changed: 6 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ Pre-configured sites (tier 1)
4646
+=====================+=======================+====================+========================================================+=================+
4747
| **HPC platforms** |
4848
+---------------------+-----------------------+--------------------+--------------------------------------------------------+-----------------+
49-
| | Hercules | GCC, Intel | ``/apps/contrib/spack-stack/`` | EPIC / JCSDA |
49+
| | Hercules | GCC, oneAPI | ``/apps/contrib/spack-stack/`` | EPIC / JCSDA |
5050
| MSU +-----------------------+--------------------+--------------------------------------------------------+-----------------+
51-
| | Orion | Intel | ``/apps/contrib/spack-stack/`` | EPIC / JCSDA |
51+
| | Orion | oneAPI | ``/apps/contrib/spack-stack/`` | EPIC / JCSDA |
5252
+---------------------+-----------------------+--------------------+--------------------------------------------------------+-----------------+
5353
| NASA | Discover SCU17 | GCC, Intel | ``/gpfsm/dswdev/jcsda/spack-stack/scu17/`` | JCSDA |
5454
+---------------------+-----------------------+--------------------+--------------------------------------------------------+-----------------+
@@ -98,53 +98,10 @@ The following is required for building new spack environments with any supported
9898
9999
# To access /apps/contrib/spack-stack directory, first login to orion-devel-1 or orion-devel-2 login node.
100100
# Then sudo to role-epic account.
101-
module purge
102-
103-
``spack-stack`` module files on **orion** require a one-time modification before they will properly load. These module files rely on a system-provided module file that alters the environment variable ``MODULEPATH`` in such a way that it prevents the expected loading of ``spack-stack`` modules. This is only necessary for *Intel oneAPI* environment module files. After the stack is created, modify the stack modules as follows:
104101
105-
.. code-block:: console
102+
module purge
103+
module load spack-managed-x86-64_v3/v1.0
106104
107-
# Edit /path/to/env/install/modulefiles/Core/stack-oneapi/<version>.lua
108-
# Change:
109-
# load("spack-managed-x86-64_v3")
110-
# load("intel-oneapi-compilers/2024.2.1")
111-
# prereq("spack-managed-x86-64_v3")
112-
113-
to
114-
115-
.. code-block:: console
116-
117-
# -- load("spack-managed-x86-64_v3")
118-
# prepend_path("MODULEPATH", "/apps/spack-managed-x86_64_v3-v1.0/modulefiles/Core:/apps/other/modulefiles:/apps/containers/modulefiles:/apps/licensed/modulefiles")
119-
# load("intel-oneapi-compilers/2024.2.1")
120-
# -- prereq("spack-managed-x86-64_v3"
121-
122-
and
123-
124-
.. code-block:: console
125-
126-
# Edit /path/to/env/install/modulefiles/oneapi/<version>/stack-intel-oneapi-mpi/<version>.lua
127-
# Change:
128-
# -- prerequisite modules
129-
# load("spack-managed-x86-64_v3")
130-
# load("intel-oneapi-compilers/2024.2.1")
131-
# load("intel-oneapi-mpi/2021.13.1")
132-
# prereq("spack-managed-x86-64_v3")
133-
# prereq("intel-oneapi-compilers/2024.2.1")
134-
# prereq("intel-oneapi-mpi/2021.13.1")
135-
136-
to
137-
138-
.. code-block:: console
139-
140-
# -- prerequisite modules
141-
# -- load("spack-managed-x86-64_v3")
142-
# load("intel-oneapi-compilers/2024.2.1")
143-
# load("intel-oneapi-mpi/2021.13.1")
144-
# -- prereq("spack-managed-x86-64_v3")
145-
# prereq("intel-oneapi-compilers/2024.2.1")
146-
# prereq("intel-oneapi-mpi/2021.13.1")
147-
148105
.. _Preconfigured_Sites_Hercules:
149106

150107
------------------------------
@@ -157,53 +114,10 @@ The following is required for building new spack environments with any supported
157114
158115
# To access /apps/contrib/spack-stack directory, first login to hercules-devel-1 or hercules-devel-2 login node.
159116
# Then sudo to role-epic account.
160-
module purge
161-
162-
163-
``spack-stack`` module files on **hercules** require a one-time modification before they will properly load. These module files rely on a system-provided module file that alters the environment variable ``MODULEPATH`` in such a way that it prevents the expected loading of ``spack-stack`` modules. This is only necessary for *Intel oneAPI* environment module files. After the stack is created, modify the stack modules as follows:
164-
165-
.. code-block:: console
166-
167-
# Edit /path/to/env/install/modulefiles/Core/stack-oneapi/<version>.lua
168-
# Change:
169-
# load("spack-managed-x86-64_v3")
170-
# load("intel-oneapi-compilers/2024.2.1")
171-
# prereq("spack-managed-x86-64_v3")
172-
173-
to
174-
175-
.. code-block:: console
176117
177-
# -- load("spack-managed-x86-64_v3")
178-
# prepend_path("MODULEPATH", "/apps/spack-managed-x86_64_v3-v1.0/modulefiles/Core:/apps/other/modulefiles:/apps/containers/modulefiles:/apps/licensed/modulefiles")
179-
# load("intel-oneapi-compilers/2024.2.1")
180-
# -- prereq("spack-managed-x86-64_v3"
181-
182-
and
183-
184-
.. code-block:: console
185-
186-
# Edit /path/to/env/install/modulefiles/oneapi/<version>/stack-intel-oneapi-mpi/<version>.lua
187-
# Change:
188-
# -- prerequisite modules
189-
# load("spack-managed-x86-64_v3")
190-
# load("intel-oneapi-compilers/2024.2.1")
191-
# load("intel-oneapi-mpi/2021.13.1")
192-
# prereq("spack-managed-x86-64_v3")
193-
# prereq("intel-oneapi-compilers/2024.2.1")
194-
# prereq("intel-oneapi-mpi/2021.13.1")
195-
196-
to
197-
198-
.. code-block:: console
118+
module purge
119+
module load spack-managed-x86-64_v3/v1.0
199120
200-
# -- prerequisite modules
201-
# -- load("spack-managed-x86-64_v3")
202-
# load("intel-oneapi-compilers/2024.2.1")
203-
# load("intel-oneapi-mpi/2021.13.1")
204-
# -- prereq("spack-managed-x86-64_v3")
205-
# prereq("intel-oneapi-compilers/2024.2.1")
206-
# prereq("intel-oneapi-mpi/2021.13.1")
207121
208122
.. _Preconfigured_Sites_Discover_SCU17:
209123

0 commit comments

Comments
 (0)