hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CrayPE fix for otf2 (#23499)

Browse source 
when using Cray's cs-prgenv, allow the build system to detect the systems as an XC
This commit is contained in:
lukebroskop 2021-05-10 15:16:41 -05:00 committed by GitHub
parent 2450ee0fb0
commit 50eec40232
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
var/spack/repos/builtin/packages/otf2/cray_ac_scorep_sys_detection-m4.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/vendor/common/build-config/m4/ac_scorep_sys_detection.m4 2019-07-19 01:31:13.409311556 -0500
+++ b/vendor/common/build-config/m4/ac_scorep_sys_detection.m4 2021-03-04 22:11:30.278313559 -0600
@@ -100,6 +100,8 @@
[test "x${build_cpu}" = "xpowerpc64" && test -d /bgsys],
[ac_scorep_platform="bgp"],
[(test "x${build_cpu}" = "xx86_64" || test "x${build_cpu}" = "xaarch64") && test -d /opt/cray],
+ [AS_IF([test -d /opt/cray/cs-prgenv],
+ [ac_scorep_platform="crayxc"])]
[AS_IF([test -L /opt/cray/pmi/default],
[AS_IF([test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[[a-z]]*$ | grep -q ss && echo TRUE`" = "xTRUE"],
[ac_scorep_platform="crayxt"],

12
var/spack/repos/builtin/packages/otf2/package.py
View file

@ -25,10 +25,22 @@ class Otf2(AutotoolsPackage):
version('1.3.1', sha256='c4605ace845d89fb1a19223137b92cc503b01e3db5eda8c9e0715d0cfcf2e4b9')
version('1.2.1', sha256='1db9fb0789de4a9c3c96042495e4212a22cb581f734a1593813adaf84f2288e4')
depends_on('autoconf', type='build', when='%cce')
depends_on('automake', type='build', when='%cce')
depends_on('libtool', type='build', when='%cce')
depends_on('m4', type='build', when='%cce')
# Fix missing initialization of variable resulting in issues when used by
# APEX/HPX: https://github.com/STEllAR-GROUP/hpx/issues/5239
patch('collective_callbacks.patch', when='@2.1:2.2')
# when using Cray's cs-prgenv, allow the build system to detect the systems as an XC
patch('cray_ac_scorep_sys_detection-m4.patch', when='%cce')
@property
def force_autoreconf(self):
return self.spec.satisfies('%cce')
def configure_args(self):
return [
'--enable-shared',