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
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ diff -urN scalapack/scalapack-2.0.2-orig/SLmake.inc.example scalapack/scalapack-
-FCFLAGS = -O3
-CCFLAGS = -O3
+NOOPT = -fPIC
+FCFLAGS = $(CFLAGS) $(NOOPT) $(GNU13FCFLAGS)
+FCFLAGS = $(CFLAGS) $(NOOPT) $(GNU14FCFLAGS)
+CCFLAGS = $(CFLAGS) $(NOOPT)
FCLOADER = $(FC)
CCLOADER = $(CC)
Expand Down
11 changes: 5 additions & 6 deletions components/parallel-libs/scalapack/SPECS/scalapack.spec
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,24 @@ cp SLmake.inc.example SLmake.inc

%build
%ohpc_setup_compiler
export CFLAGS="${CFLAGS} -Wno-implicit-function-declaration"
export CFLAGS="${CFLAGS} -Wno-implicit-int"

%if "%{compiler_family}" == "arm1"
%{__sed} -i -e 's#-lblas#-L$(ARMPL_LIBRARIES) -larmpl#g' SLmake.inc
%{__sed} -i -e 's#-llapack#-L$(ARMPL_LIBRARIES) -larmpl#g' SLmake.inc
%{__cat} SLmake.inc
export CFLAGS="${CFLAGS} -fsimdmath"
%endif
%if "%{compiler_family}" == "intel" || "%{compiler_family}" == "arm1"
export CFLAGS="${CFLAGS} -Wno-implicit-function-declaration"
export CFLAGS="${CFLAGS} -Wno-implicit-int"
%endif
%if "%{compiler_family}" == "gnu13"
%if "%{compiler_family}" == "gnu14"
module load openblas
# configure fails with:
# The Fortran compiler gfortran does not accept programs that
# call the same routine with arguments of different types without
# the option -fallow-argument-mismatch.
# Rerun configure with FFLAGS=-fallow-argument-mismatch
# This seems to fix the build.
export GNU13FCFLAGS=-fallow-argument-mismatch
export GNU14FCFLAGS=-fallow-argument-mismatch
%endif
make lib

Expand Down
Loading