Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/parallel-libs/petsc/SPECS/petsc.spec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Name: %{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
Summary: Portable Extensible Toolkit for Scientific Computation
License: 2-clause BSD
Group: %{PROJ_NAME}/parallel-libs
Version: 3.25.0
Version: 3.25.1
Release: 1%{?dist}
Source0: https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-%{version}.tar.gz
Url: http://www.mcs.anl.gov/petsc/
Expand Down
2 changes: 1 addition & 1 deletion components/parallel-libs/slepc/SPECS/slepc.spec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
%define pname slepc

Name: %{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
Version: 3.25.0
Version: 3.25.1
Release: 1
Summary: A library for solving large scale sparse eigenvalue problems
License: LGPL-3.0
Expand Down
72 changes: 0 additions & 72 deletions components/serial-libs/plasma/SOURCES/48.patch

This file was deleted.

8 changes: 3 additions & 5 deletions components/serial-libs/plasma/SPECS/plasma.spec
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
%global pname plasma

Name: %{pname}-%{compiler_family}%{PROJ_DELIM}
Version: 24.8.7
Version: 25.5.27
Release: 1%{?dist}
Summary: Parallel Linear Algebra Software for Multicore Architectures
License: BSD-3-Clause
Group: %{PROJ_NAME}/serial-libs
URL: https://github.com/icl-utk-edu/plasma/
Source0: https://github.com/icl-utk-edu/plasma/releases/download/%{version}/plasma-%{version}.tar.gz
Patch0: https://github.com/icl-utk-edu/plasma/pull/48.patch
Source0: https://github.com/icl-utk-edu/plasma/archive/refs/tags/%{version}.tar.gz
# Tell cmake to include the Fortran plasma_mod.o in the shared object
Patch1: cmake-fortran.patch
# Exclude functions from plasma_mod.o which do not seem to be implemented.
Expand Down Expand Up @@ -55,7 +54,6 @@ least squares problems, eigenvalue problems, and singular value problems.

%prep
%setup -q -n %{pname}-%{version}
%patch -P 0 -p 1
%patch -P 1 -p 1
%patch -P 2 -p 1

Expand All @@ -69,7 +67,7 @@ module load openblas
module load cmake

# Generate fortran bindings
python3 tools/codegen.py -p s -p d -p c include/*h
python3 tools/codegen.py -p s -p d -p c -p ds include/*h
python3 tools/fortran_gen.py --prefix include/ include/plasma*h
# Create plasma.mod
${FC} -fPIC -c -o include/plasma_mod.o include/plasma_mod.f90
Expand Down
10 changes: 5 additions & 5 deletions tests/libs/plasma/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
#

AC_PREREQ(2.59)
AC_INIT(plasma, 2.8.0, [https://github.com/openhpc/ohpc])
AC_PREREQ([2.71])
AC_INIT([plasma],[2.8.0],[https://github.com/openhpc/ohpc])
AM_INIT_AUTOMAKE([foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_SUBST([LOG_DRIVER],['$(SHELL) $(top_srcdir)/../../test-driver-ohpc'])
Expand All @@ -13,7 +13,7 @@ AC_MSG_CHECKING([for PLASMA_DIR environment variable])
if test "x$PLASMA_DIR" = "x"; then
AC_MSG_RESULT([no])
echo
AC_ERROR([PLASMA_DIR not defined - please load plasma environment.])
AC_MSG_ERROR(PLASMA_DIR not defined - please load plasma environment.)
else
AC_MSG_RESULT([yes])
fi
Expand Down Expand Up @@ -43,7 +43,7 @@ fi
AC_CONFIG_FILES(Makefile tests/Makefile)

# Configure
AC_OUTPUT()
AC_OUTPUT

echo
echo '-------------------------------------------------- SUMMARY --------------------------------------------------'
Expand All @@ -53,7 +53,7 @@ echo OHPC compiler toolchain....... : $LMOD_FAMILY_COMPILER
echo
echo C compiler.................... : `which $CC`
echo F77 compiler ................. : `which $F77`
echo F90 compiler ................. : `which $F77`
echo F90 compiler ................. : `which $FC`
echo
echo C compiler flags.............. : $CFLAGS
echo F77 compiler flags............ : $FFLAGS
Expand Down
5 changes: 1 addition & 4 deletions tests/libs/plasma/ohpc-tests/test_compiler_families
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ cd libs/plasma || exit 1

export BATS_JUNIT_CLASS=PLASMA

# bootstrap the local autotools project if necessary

./bootstrap || exit 1

for compiler in $COMPILER_FAMILIES ; do

if [ "$compiler" == "arm1" ]; then
Expand All @@ -32,6 +28,7 @@ for compiler in $COMPILER_FAMILIES ; do
module load $compiler || exit 1
module load plasma || exit 1

./bootstrap || exit 1
./configure || exit 1
make clean || exit 1
make -k check || status=1
Expand Down
5 changes: 0 additions & 5 deletions tests/libs/plasma/tests/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
TESTS_ENVIRONMENT = BATS_NO_SUMMARY=1

check_PROGRAMS = C_test
C_test_SOURCES = test_zhesv.c test.c

Expand All @@ -8,6 +6,3 @@ F90_test_SOURCES = test_zpotri.f90

TESTS = test_module
TESTS += rm_execution



1 change: 0 additions & 1 deletion tests/libs/plasma/tests/common

This file was deleted.

45 changes: 26 additions & 19 deletions tests/libs/plasma/tests/rm_execution
Original file line number Diff line number Diff line change
@@ -1,40 +1,47 @@
#!/usr/bin/env -S bats --report-formatter junit --formatter tap -j 2
# -*-sh-*-

load ./common/test_helper_functions || exit 1
source ./common/functions || exit 1
load ../../../common/test_helper_functions || exit 1
source ../../../common/functions || exit 1

if [ -s ./common/TEST_ENV ]; then
source ./common/TEST_ENV
if [ -s ../../../common/TEST_ENV ]; then
source ../../../common/TEST_ENV
fi

setup_file() {
check_rms

NODES=1
TASKS=$(tasks_count 4)
ARGS=0
TIMEOUT="00:05:00"
TESTNAME="libs/PLASMA"

export NODES TASKS ARGS TIMEOUT TESTNAME
}

setup() {
if [ "${LMOD_FAMILY_COMPILER}" == "acfl" ] || [ "${LMOD_FAMILY_COMPILER}" == "intel" ]; then
skip "Test segfaults with ${LMOD_FAMILY_COMPILER} compiler"
fi
}

check_rms
export RM=$RESOURCE_MANAGER

export TESTNAME="libs/PLASMA"

ARGS=0

@test "[$TESTNAME/C_test] C_test under resource manager ($RM/$LMOD_FAMILY_COMPILER)" {
if [ ! -s C_test ]; then
flunk "C_test binary does not exist"
@test "[${TESTNAME}/C_test] C_test under resource manager (${RESOURCE_MANAGER}/$LMOD_FAMILY_COMPILER)" {
EXE=./C_test
if [ ! -s "${EXE}" ]; then
flunk "${EXE} binary does not exist"
fi

run_serial_binary ./C_test $ARGS
run_serial_binary -t "${TIMEOUT}" "${EXE}" "${ARGS}"
assert_success
}

@test "[$TESTNAME/F90_test] F90_test under resource manager ($RM/$LMOD_FAMILY_COMPILER)" {
if [ ! -s F90_test ]; then
flunk "F90_test binary does not exist"
@test "[${TESTNAME}/F90_test] F90_test under resource manager (${RESOURCE_MANAGER}/$LMOD_FAMILY_COMPILER)" {
EXE=./F90_test
if [ ! -s "${EXE}" ]; then
flunk "${EXE} binary does not exist"
fi

run_serial_binary ./F90_test "< gebrd_example.d"
run_serial_binary -t "${TIMEOUT}" "${EXE} < gebrd_example.d"
assert_success
}
2 changes: 1 addition & 1 deletion tests/libs/plasma/tests/test.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ void print_main_usage(const char *program_name)
"\t%s routine [parameter1, parameter2, ...]\n"
"\n"
"Available routines:",
program_name, program_name, program_name);
program_name, program_name, program_name, program_name);
for (int i = 0; routines[i].name != NULL; ++i) {
if (i % 4 == 0) {
printf("\n\t");
Expand Down
Loading
Loading