Enable ARMPL in the armclang build

Fixes #2685

Change-Id: I1827c1c55e533bd7ff82b452d77143cb6d04cc01

diff --git a/admin/builds/gromacs.py b/admin/builds/gromacs.py
index 0e873ea4e174f7ab2451cc9c253f6f319aa0db02..c1c5e38a21bdc32c52a92a979403ef850982744f 100644 (file)
--- a/admin/builds/gromacs.py
+++ b/admin/builds/gromacs.py
@@ -130,10 +130,10 @@ def do_build(context):
         cmake_opts['clFFT_ROOT'] = context.env.clFFT_root
 
     if context.opts.armpl:
-        cmake_opts['FFTWF_LIBRARY'] = os.path.join(context.env.armpl_dir, 'lib/libarmpl_lp64.so')
-        cmake_opts['FFTWF_INCLUDE_DIR'] = os.path.join(context.env.armpl_dir, '/include')
-        cmake_opts['GMX_BLAS_USER'] = os.path.join(context.env.armpl_dir, '/lib/libarmpl_lp64.so')
-        cmake_opts['GMX_LAPACK_USER'] = os.path.join(context.env.armpl_dir, '/lib/libarmpl_lp64.so')
+        cmake_opts['FFTWF_LIBRARY']     = os.path.join(context.env.armpl_dir, 'lib/libarmpl_lp64.so')
+        cmake_opts['FFTWF_INCLUDE_DIR'] = os.path.join(context.env.armpl_dir, 'include')
+        cmake_opts['GMX_BLAS_USER']     = os.path.join(context.env.armpl_dir, 'lib/libarmpl_lp64.so')
+        cmake_opts['GMX_LAPACK_USER']   = os.path.join(context.env.armpl_dir, 'lib/libarmpl_lp64.so')
 
     if context.opts.hwloc is False:
         cmake_opts['GMX_HWLOC'] = 'OFF'

diff --git a/admin/builds/post-submit-matrix.txt b/admin/builds/post-submit-matrix.txt
index 54be31af55767634be504419bcc8dd082cbc1e54..4808372448daaf2299e55b3f829b9d8039d3b3d3 100644 (file)
--- a/admin/builds/post-submit-matrix.txt
+++ b/admin/builds/post-submit-matrix.txt
@@ -67,7 +67,9 @@ icc-18 msvc-2017 fftpack simd=avx2_256 release
 #gcc-7 armhpc-18.2 openmp simd=ARM_NEON_ASIMD release
 
 # Test ARM HPC compier toolchain with armclang
-armclang-18.4 armhpc-18.4 openmp simd=ARM_NEON_ASIMD release-with-assert
+# Test ARMPL for FFTs
+# Test linking against ARMPL for BLAS/LAPACK
+armclang-18.4 armhpc-18.4 armpl openmp simd=ARM_NEON_ASIMD release-with-assert
 
 # TODO
 # Add SIMD + OpenMP + CUDA asan build