Removed the option to use LIBXSMM. It is outdated

Author: vdweide

Common/include/linear_algebra/blas_structure.hpp

@@ -29,11 +29,6 @@
 
 #pragma once
 
-/* LIBXSMM include files, if supported. */
-#ifdef HAVE_LIBXSMM
-#include "libxsmm.h"
-#endif
-
 class CConfig;
 
 /*!
@@ -494,7 +489,7 @@ class CBlasStructure {
   }
 
  private:
-#if !(defined(HAVE_LIBXSMM) || defined(HAVE_BLAS) || defined(HAVE_MKL)) || \
+#if !(defined(HAVE_BLAS) || defined(HAVE_MKL)) || \
     (defined(CODI_REVERSE_TYPE) || defined(CODI_FORWARD_TYPE))
   /* Blocking parameters for the outer kernel.  We multiply mc x kc blocks of
    the matrix A with kc x nc panels of the matrix B (this approach is referred

Common/src/linear_algebra/blas_structure.cpp

@@ -43,7 +43,7 @@ extern "C" void dgemv_(char*, const int*, const int*, const passivedouble*, cons
 
 /* Constructor. Initialize the const member variables, if needed. */
 CBlasStructure::CBlasStructure()
-#if !(defined(HAVE_LIBXSMM) || defined(HAVE_BLAS) || defined(HAVE_MKL)) || \
+#if !(defined(HAVE_BLAS) || defined(HAVE_MKL)) || \
     (defined(CODI_REVERSE_TYPE) || defined(CODI_FORWARD_TYPE))
     : mc(256),
       kc(128),
@@ -62,37 +62,25 @@ void CBlasStructure::gemm(const int M, const int N, const int K, const su2double
 #endif
 
 #if (defined(CODI_REVERSE_TYPE) || defined(CODI_FORWARD_TYPE)) || \
-    !(defined(HAVE_LIBXSMM) || defined(HAVE_MKL) || defined(HAVE_BLAS))
+    !(defined(HAVE_MKL) || defined(HAVE_BLAS))
   /* Native implementation of the matrix product. This optimized implementation
      assumes that the matrices are in column major order. This can be
      accomplished by swapping N and M and A and B. This implementation is based
      on https://github.com/flame/how-to-optimize-gemm. */
   gemm_imp(N, M, K, B, A, C);
 
-#else
-#ifdef HAVE_LIBXSMM
-
-  /* The gemm function of libxsmm is used to carry out the multiplication.
-     Note that libxsmm_gemm expects the matrices in column major order. That's
-     why the in the calling sequence A and B and M and N are reversed. */
-  su2double alpha = 1.0;
-  su2double beta = 0.0;
-  char trans = 'N';
-
-  libxsmm_dgemm(&trans, &trans, &N, &M, &K, &alpha, B, &N, A, &K, &beta, C, &N);
-
 #else  // MKL and BLAS
 
   /* The standard blas routine dgemm is used for the multiplication.
      Call dgemm without transposing the matrices. In that case dgemm expects
-     the matrices in column major order, see the comments for libxsmm. */
+     the matrices in column major order. That's why the in the calling
+     sequence A and B and M and N are reversed. */
   su2double alpha = 1.0;
   su2double beta = 0.0;
   char trans = 'N';
 
   dgemm_(&trans, &trans, &N, &M, &K, &alpha, B, &N, A, &K, &beta, C, &N);
 
-#endif
 #endif
 
   /* Store the profiling information, if needed. */
@@ -131,7 +119,7 @@ void CBlasStructure::gemv(const int M, const int N, const su2double* A, const su
 #endif
 }
 
-#if !(defined(HAVE_LIBXSMM) || defined(HAVE_BLAS) || defined(HAVE_MKL)) || \
+#if !(defined(HAVE_BLAS) || defined(HAVE_MKL)) || \
     (defined(CODI_REVERSE_TYPE) || defined(CODI_FORWARD_TYPE))
 
 /* Macros for accessing submatrices of a matmul using the leading dimension. */

SU2_CFD/src/SU2_CFD.cpp

@@ -27,11 +27,6 @@
 
 #include "../include/SU2_CFD.hpp"
 
-/* LIBXSMM include files, if supported. */
-#ifdef HAVE_LIBXSMM
-#include "libxsmm.h"
-#endif
-
 /* Include file, needed for the runtime NaN catching. You also have to include feenableexcept(...) below. */
 //#include <fenv.h>
 
@@ -77,11 +72,6 @@ int main(int argc, char *argv[]) {
   /*--- Uncomment the following line if runtime NaN catching is desired. ---*/
   // feenableexcept(FE_INVALID | FE_OVERFLOW | FE_DIVBYZERO );
 
-  /*--- Initialize libxsmm, if supported. ---*/
-#ifdef HAVE_LIBXSMM
-  libxsmm_init();
-#endif
-
   /*--- Create a pointer to the main SU2 Driver ---*/
 
   CDriver* driver = nullptr;
@@ -154,11 +144,6 @@ int main(int argc, char *argv[]) {
 
   delete driver;
 
-  /*---Finalize libxsmm, if supported. ---*/
-#ifdef HAVE_LIBXSMM
-  libxsmm_finalize();
-#endif
-
   /*--- Finalize AD. ---*/
   AD::Finalize();