From 9e61525887f33eedea795c2da780e73cd48a5595 Mon Sep 17 00:00:00 2001 From: Hans Pabst Date: Tue, 18 Jan 2022 13:07:17 +0100 Subject: [PATCH] Preparation for LIBXSMM 2.0 (#1879) * Suppressed LIBXSMM_VERSION_MAJOR, LIBXSMM_VERSION_MINOR, and LIBXSMM_VERSION_PATCH. --- src/grid/cpu/utils.c | 10 ++++++++-- tools/precommit/check_file_properties.py | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/grid/cpu/utils.c b/src/grid/cpu/utils.c index 74825b8e5c..b25aa82cf8 100644 --- a/src/grid/cpu/utils.c +++ b/src/grid/cpu/utils.c @@ -41,7 +41,10 @@ void dgemm_simplified(dgemm_params *const m) { if (m == NULL) abort(); -#if defined(__LIBXSMM) +#if defined(__LIBXSMM) && \ + LIBXSMM_VERSION4(1, 17, 0, 2079) > \ + LIBXSMM_VERSION4(LIBXSMM_VERSION_MAJOR, LIBXSMM_VERSION_MINOR, \ + LIBXSMM_VERSION_UPDATE, LIBXSMM_VERSION_PATCH) if (m->use_libxsmm && m->op2 == 'N') { /* we are in row major but xsmm is in column major */ m->prefetch = LIBXSMM_PREFETCH_AUTO; @@ -106,7 +109,10 @@ void batched_dgemm_simplified(dgemm_params *const m, const int batch_size) { assert(m != NULL); assert(batch_size > 0); -#if defined(__LIBXSMM) +#if defined(__LIBXSMM) && \ + LIBXSMM_VERSION4(1, 17, 0, 2079) > \ + LIBXSMM_VERSION4(LIBXSMM_VERSION_MAJOR, LIBXSMM_VERSION_MINOR, \ + LIBXSMM_VERSION_UPDATE, LIBXSMM_VERSION_PATCH) if (m->use_libxsmm && m->op2 == 'N') { /* we are in row major but xsmm is in column major */ m->prefetch = LIBXSMM_PREFETCH_AUTO; diff --git a/tools/precommit/check_file_properties.py b/tools/precommit/check_file_properties.py index 175782e3a1..31f6eab875 100755 --- a/tools/precommit/check_file_properties.py +++ b/tools/precommit/check_file_properties.py @@ -58,6 +58,9 @@ FLAG_EXCEPTIONS = ( r"__T_C_G0", r"__YUKAWA", r"__cplusplus", + r"LIBXSMM_VERSION_MAJOR", + r"LIBXSMM_VERSION_MINOR", + r"LIBXSMM_VERSION_PATCH", ) FLAG_EXCEPTIONS_RE = re.compile(r"|".join(FLAG_EXCEPTIONS))