mx/MX_Pmodule
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '223-elegant-2021-4-with-oagtcl' into 'master'

Browse Source 
Resolve "elegant 2021.4 with oagtcl"

Closes #223

See merge request Pmodules/buildblocks!317
This commit is contained in:
gsell
2022-07-05 09:05:08 +00:00
parent 86292b8297 bfd5bcc1d5
commit f94cbcf291
5 changed files with 121 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
MPI/elegant/files/oag-apps.patch Normal file
View File

@@ -0,0 +1,79 @@
diff -u linux-x86_64.orig/computeQuadFringeIntegrals linux-x86_64/computeQuadFringeIntegrals
--- linux-x86_64.orig/computeQuadFringeIntegrals 2022-05-11 17:16:01.000000000 +0200
+++ linux-x86_64/computeQuadFringeIntegrals 2022-05-12 16:36:53.000000000 +0200
@@ -2,8 +2,9 @@
# \
exec oagtclsh "$0" "$@"
-set auto_path [linsert $auto_path 0 /usr/local/oag/apps/lib/$env(HOST_ARCH)]
-set auto_path [linsert $auto_path 0 /usr/local/oag/lib_patch/$env(HOST_ARCH)]
+if {![info exists env(OAG_TOP_DIR)]} { set env(OAG_TOP_DIR) /usr/local }
+set auto_path [linsert $auto_path 0 $env(OAG_TOP_DIR)/oag/apps/lib/$env(HOST_ARCH)]
+
APSStandardSetup
#
diff -u linux-x86_64.orig/computeSCTuneSpread linux-x86_64/computeSCTuneSpread
--- linux-x86_64.orig/computeSCTuneSpread 2022-05-11 17:16:01.000000000 +0200
+++ linux-x86_64/computeSCTuneSpread 2022-05-12 16:39:28.000000000 +0200
@@ -2,11 +2,8 @@
# \
exec oagtclsh "$0" "$@"
-if [info exists $env(OAG_TOP_DIR)] {
- set auto_path [linsert $auto_path 0 $env(OAG_TOP_DIR)/oag/apps/lib/$env(HOST_ARCH)]
-} else {
- set auto_path [linsert $auto_path 0 /usr/local/oag/apps/lib/$env(HOST_ARCH)]
-}
+if {![info exists env(OAG_TOP_DIR)]} { set env(OAG_TOP_DIR) /usr/local }
+set auto_path [linsert $auto_path 0 $env(OAG_TOP_DIR)/oag/apps/lib/$env(HOST_ARCH)]
APSStandardSetup
diff -u linux-x86_64.orig/elegant2track linux-x86_64/elegant2track
--- linux-x86_64.orig/elegant2track 2022-05-11 17:16:00.000000000 +0200
+++ linux-x86_64/elegant2track 2022-05-12 16:38:20.000000000 +0200
@@ -2,8 +2,9 @@
# \
exec oagtclsh "$0" "$@"
-set auto_path [linsert $auto_path 0 /usr/local/oag/apps/lib/$env(HOST_ARCH)]
-set auto_path [linsert $auto_path 0 /usr/local/oag/lib_patch/$env(HOST_ARCH)]
+if {![info exists env(OAG_TOP_DIR)]} { set env(OAG_TOP_DIR) /usr/local }
+set auto_path [linsert $auto_path 0 $env(OAG_TOP_DIR)/oag/apps/lib/$env(HOST_ARCH)]
+
APSStandardSetup
package require rpn
diff -u linux-x86_64.orig/spectra2sdds linux-x86_64/spectra2sdds
--- linux-x86_64.orig/spectra2sdds 2022-05-11 17:15:10.000000000 +0200
+++ linux-x86_64/spectra2sdds 2022-05-12 16:38:55.000000000 +0200
@@ -2,8 +2,9 @@
# \
exec oagtclsh "$0" "$@"
-set auto_path [linsert $auto_path 0 /usr/local/oag/apps/lib/$env(HOST_ARCH)]
-set auto_path [linsert $auto_path 0 /usr/local/oag/lib_patch/$env(HOST_ARCH)]
+if {![info exists env(OAG_TOP_DIR)]} { set env(OAG_TOP_DIR) /usr/local }
+set auto_path [linsert $auto_path 0 $env(OAG_TOP_DIR)/oag/apps/lib/$env(HOST_ARCH)]
+
APSStandardSetup
set usage {usage: spectra2sdds2 -input <filename> -output <filename>}
diff -u linux-x86_64.orig/track2mag linux-x86_64/track2mag
--- linux-x86_64.orig/track2mag 2022-05-11 17:16:00.000000000 +0200
+++ linux-x86_64/track2mag 2022-05-12 16:31:42.000000000 +0200
@@ -2,8 +2,11 @@
# \
exec oagtclsh "$0" "$@"
-set auto_path [linsert $auto_path 0 /usr/local/oag/apps/lib/$env(HOST_ARCH)]
-set auto_path [linsert $auto_path 0 /usr/local/oag/lib_patch/$env(HOST_ARCH)]
+if {![info exists env(OAG_TOP_DIR)] || [string length $env(OAG_TOP_DIR)]==0} {
+ set env(OAG_TOP_DIR) /usr/local
+}
+set auto_path [linsert $auto_path 0 $env(OAG_TOP_DIR)/oag/apps/lib/$env(HOST_ARCH)]
+
APSStandardSetup
set usage {usage: track2mag -input <filename> -output <filename> }

1
MPI/elegant/files/variants.merlin6
View File

@@ -1 +0,0 @@
elegant/2020.2.0_merlin6 stable gcc/8.4.0 openmpi/3.1.6_slurm gsl/2.6

5
MPI/elegant/files/variants.rhel6
View File

@@ -1,5 +0,0 @@
elegant/2020.2.0 stable gcc/8.4.0 openmpi/3.1.6 gsl/2.6
elegant/32.0.0 deprecated gcc/5.4.0 openmpi/1.10.4
elegant/33.1.2 deprecated gcc/5.4.0 openmpi/1.10.4
elegant/34.2.0 deprecated gcc/7.3.0 mpich/3.2.1

41
MPI/elegant/files/variants.yaml Normal file
View File

@@ -0,0 +1,41 @@
overlay: base
relstage: stable
elegant/32.0.0:
- with: gcc/5.4.0 openmpi/1.10.4
systems: rhel6
relstage: deprecated
elegant/33.1.2:
- with: gcc/5.4.0 openmpi/1.10.4
systems: rhel6
relstage: deprecated
elegant/34.2.0:
- with: gcc/7.3.0 mpich/3.2.1
systems: rhel6
relstage: deprecated
elegant/2020.2.0:
- with: gcc/8.4.0 openmpi/3.1.6
systems: rhel6
elegant/2020.2.0_merlin6:
- with: gcc/8.4.0 openmpi/3.1.6_slurm
systems: slurm
elegant/2021.4.0:
- with: gcc/10.3.0 openmpi/4.0.5
systems: rhel6
elegant/2021.4.0_slurm:
- with: gcc/10.3.0 openmpi/4.0.5-1_slurm
relstage: deprecated
systems: slurm
elegant/2021.4.0-1_slurm:
- with: gcc/10.3.0 openmpi/4.0.5-1_slurm
relstage: deprecated
systems: slurm
elegant/2021.4.0-2_slurm:
- with: gcc/10.3.0 openmpi/4.0.5-1_slurm
systems: slurm

1
MPI/elegant/modulefile
View File

@@ -21,6 +21,7 @@ effects, such as wakes and coherent synchrotron radiation.
setenv RPN_DEFNS $PREFIX/RPN_DEFNS
setenv HOST_ARCH linux-x86_64
setenv EPICS_HOST_ARCH linux-x86_64
setenv OAG_TOP_DIR $PREFIX
append-path PATH $PREFIX/epics/extensions/bin/linux-x86_64
append-path PATH $PREFIX/oag/apps/bin/linux-x86_64