Revert "Attempt to avoid duplicate symbols due to linking DBCSR (w/ L…

…IBXSMM) and LIBXSMM." This reverts commit f963d32.
hfp · Sep 7, 2023 · 26ef0bd · 26ef0bd
1 parent 716921e
commit 26ef0bd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/config/cp2k/Linux-x86-64-intelx.arch b/config/cp2k/Linux-x86-64-intelx.arch
@@ -842,10 +842,10 @@ ifneq (,$(LIBXSMMROOT))
     # investigate __HAS_smm_vec
     #DFLAGS += -D__HAS_smm_vec
 
-    # attempt to link libxsmmext (needed at least in case of WRAP); can cause duplicate symbols due to DBCSR
-    #LIBS += $(CP2KHOME)/$(LIBDIRNAME)/$(ARCH)/$(ONEVERSION)/libxsmm/lib/libxsmmf.a
-    #LIBS += $(CP2KHOME)/$(LIBDIRNAME)/$(ARCH)/$(ONEVERSION)/libxsmm/lib/libxsmmext.a
-    #LIBS += $(CP2KHOME)/$(LIBDIRNAME)/$(ARCH)/$(ONEVERSION)/libxsmm/lib/libxsmm.a
+    # always attempt to link libxsmmext (needed at least in case of WRAP)
+    LIBS += $(CP2KHOME)/$(LIBDIRNAME)/$(ARCH)/$(ONEVERSION)/libxsmm/lib/libxsmmf.a
+    LIBS += $(CP2KHOME)/$(LIBDIRNAME)/$(ARCH)/$(ONEVERSION)/libxsmm/lib/libxsmmext.a
+    LIBS += $(CP2KHOME)/$(LIBDIRNAME)/$(ARCH)/$(ONEVERSION)/libxsmm/lib/libxsmm.a
     IFLAGS += -I$(CP2KHOME)/$(LIBDIRNAME)/$(ARCH)/$(ONEVERSION)/libxsmm/include
 
     # account for OpenMP-enabled libxsmmext routines