scalasca: Update to version 2.6.1, use new modules

Signed-off-by: Jan André Reuter <[email protected]>
openhpc · May 29, 2024 · 6b269f0 · 6b269f0
1 parent 0ba8c65
commit 6b269f0
Showing 1 changed file with 32 additions and 13 deletions.
diff --git a/components/perf-tools/scalasca/SPECS/scalasca.spec b/components/perf-tools/scalasca/SPECS/scalasca.spec
@@ -18,16 +18,20 @@
 
 Summary:   Toolset for performance analysis of large-scale parallel applications
 Name:      %{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
-Version:   2.5
+Version:   2.6.1
 Release:   1%{?dist}
 License:   BSD
 Group:     %{PROJ_NAME}/perf-tools
 URL:       http://www.scalasca.org
 Source0:   http://apps.fz-juelich.de/scalasca/releases/scalasca/%{version}/dist/scalasca-%{version}.tar.gz
-Requires:  lmod%{PROJ_DELIM} >= 7.6.1
-BuildRequires: scorep-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
-Requires:  scorep-%{compiler_family}-%{mpi_family}%{PROJ_DELIM} >= 4.0
+BuildRequires: cubew-%{compiler_family}%{PROJ_DELIM} >= 4.8
+BuildRequires: otf2-%{compiler_family}-%{mpi_family}%{PROJ_DELIM} >= 3.0
 BuildRequires: zlib-devel gcc-c++ which make
+Requires: lmod%{PROJ_DELIM} >= 7.6.1
+Requires: cubew-%{compiler_family}%{PROJ_DELIM} >= 4.8
+Requires: cubelib-%{compiler_family}%{PROJ_DELIM} >= 4.4
+Requires: otf2-%{compiler_family}-%{mpi_family}%{PROJ_DELIM} >= 3.0
+Requires: scorep-%{compiler_family}-%{mpi_family}%{PROJ_DELIM} >= 1.2
 
 # Default library install path
 %define install_path %{OHPC_LIBS}/%{compiler_family}/%{mpi_family}/%{pname}/%version
@@ -57,11 +61,11 @@ This is the %{compiler_family}-%{mpi_family} version.
 # OpenHPC compiler/mpi designation
 %ohpc_setup_compiler
 
-module load scorep
+module load cubew
+module load otf2
 
 %if "%{compiler_family}" == "intel"
-CONFIGURE_OPTIONS="--with-nocross-compiler-suite=intel "
-export __INTEL_PRE_CFLAGS="-diag-disable=10441"
+CONFIGURE_OPTIONS="--with-nocross-compiler-suite=oneapi "
 %endif
 
 %if "%{compiler_family}" == "arm1"
@@ -93,20 +97,33 @@ CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-mpi=openmpi "
 CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-mpi=openmpi "
 %endif
 
-./configure --prefix=%{install_path} $CONFIGURE_OPTIONS \
-	CFLAGS="${CFLAGS}" \
-	CXXFLAGS="${CXXFLAGS}" \
-	CC=${CC} \
-	CXX=${CXX}
+./configure --prefix=%{install_path} \
+            --disable-silent-rules \
+            --enable-backend-test-runs \
+            --with-platform=linux \
+            CC="$CC" \
+            CXX="$CXX" \
+            ${CONFIGURE_OPTIONS}
 
 make %{?_smp_mflags} V=1
 
+%check
+
+# OpenHPC compiler/mpi designation
+%ohpc_setup_compiler
+
+module load cubew
+module load otf2
+
+make check
+
 %install
 
 # OpenHPC compiler designation
 %ohpc_setup_compiler
 
-module load scorep
+module load cubew
+module load otf2
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
@@ -136,6 +153,8 @@ module-whatis "URL %{url}"
 set     version			    %{version}
 
 depends-on scorep
+depends-on otf2
+depends-on cubew
 
 prepend-path    PATH                %{install_path}/bin
 prepend-path    MANPATH             %{install_path}/share/man