Disable libvori and libxsmm explicitly for Darwin-aarch64

cp2k · Oct 5, 2022 · e7ab7ad · e7ab7ad
1 parent f5e83b7
commit e7ab7ad
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/arch/Darwin-aarch64.ssmp b/arch/Darwin-aarch64.ssmp
@@ -2,13 +2,13 @@
 #
 # CP2K Darwin arch file for a serial aarch64 (arm64) binary
 #
-# Tested with: GNU 12.2.0, FFTW 3.3.10, LIBINT 2.6.0, LIBVORI 220621,
-#              LIBXC 5.2.3, OpenBLAS 0.3.20, SPGLIB 1.16.2
+# Tested with: GNU 12.2.0, FFTW 3.3.10, LIBINT 2.6.0,
+#              LIBXC 5.2.3, OpenBLAS 0.3.21, SPGLIB 1.16.2
 #          on: Apple M1 (macOS Monterey 12.4)
 #
 # Usage: Source this arch file and then run make as instructed.
 #
-# Author: Matthias Krack (30.09.2022)
+# Author: Matthias Krack (05.10.2022)
 #
 # \
    if [[ "${0}" == "${BASH_SOURCE}" ]]; then \
@@ -28,7 +28,7 @@
       cd ../..; \
       return 1; \
    fi; \
-   ./install_cp2k_toolchain.sh -j8 --mpi-mode=no --no-arch-files --with-cmake=system --with-gcc=system --with-fftw=system --with-openblas=system; \
+   ./install_cp2k_toolchain.sh -j8 --mpi-mode=no --no-arch-files --with-cmake=system --with-gcc=system --with-fftw=system --with-libvori=no --with-libxsmm=no --with-openblas=system; \
    source ./install/setup; \
    cd ../..; \
    echo; \
@@ -44,7 +44,7 @@ DO_CHECKS      := no
 USE_ACCELERATE := no
 USE_FFTW       := 3.3.10
 USE_LIBINT     := 2.6.0
-USE_LIBVORI    := 220621
+#USE_LIBVORI    := 220621
 USE_LIBXC      := 5.2.3
 USE_SPGLIB     := 1.16.2
 
@@ -67,7 +67,6 @@ INSTALL_PATH   := $(PWD)/tools/toolchain/install
 # Settings for regression testing
 ifeq ($(DO_CHECKS), yes)
    DFLAGS         += -D__CHECK_DIAG
-   CFLAGS_DEBUG   := -fsanitize=address
    FCFLAGS_DEBUG  := -fcheck=bounds,do,recursion,pointer
    FCFLAGS_DEBUG  += -fcheck=all,no-array-temps
    FCFLAGS_DEBUG  += -ffpe-trap=invalid,overflow,zero
@@ -151,7 +150,7 @@ else
    LIBS           += $(OPENBLAS_LIB)/libopenblas.a
 endif
 
-CFLAGS         += $(DFLAGS) $(CFLAGS_DEBUG)
+CFLAGS         += $(DFLAGS)
 
 FCFLAGS        := $(CFLAGS) $(FCFLAGS_DEBUG) $(WFLAGS)
 FCFLAGS        += -fallow-argument-mismatch