From 22173ba5bcb61ebfd07b3f1cf26318366fedecc9 Mon Sep 17 00:00:00 2001 From: Hans Pabst Date: Mon, 24 Jan 2022 14:20:04 +0100 Subject: [PATCH] Issue #1889: revised PR #1879 (#1898) --- src/grid/cpu/utils.c | 12 ++++++------ tools/precommit/check_file_properties.py | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/grid/cpu/utils.c b/src/grid/cpu/utils.c index df5331af63..527e3cd160 100644 --- a/src/grid/cpu/utils.c +++ b/src/grid/cpu/utils.c @@ -42,9 +42,9 @@ void dgemm_simplified(dgemm_params *const m) { abort(); #if defined(__LIBXSMM) -#if LIBXSMM_VERSION4(1, 17, 0, 2079) > \ - LIBXSMM_VERSION4(LIBXSMM_VERSION_MAJOR, LIBXSMM_VERSION_MINOR, \ - LIBXSMM_VERSION_UPDATE, LIBXSMM_VERSION_PATCH) +#if LIBXSMM_VERSION2(1, 17) >= \ + LIBXSMM_VERSION2(LIBXSMM_VERSION_MAJOR, LIBXSMM_VERSION_MINOR) && \ + (2079 > 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; @@ -111,9 +111,9 @@ void batched_dgemm_simplified(dgemm_params *const m, const int batch_size) { assert(batch_size > 0); #if defined(__LIBXSMM) -#if LIBXSMM_VERSION4(1, 17, 0, 2079) > \ - LIBXSMM_VERSION4(LIBXSMM_VERSION_MAJOR, LIBXSMM_VERSION_MINOR, \ - LIBXSMM_VERSION_UPDATE, LIBXSMM_VERSION_PATCH) +#if LIBXSMM_VERSION2(1, 17) >= \ + LIBXSMM_VERSION2(LIBXSMM_VERSION_MAJOR, LIBXSMM_VERSION_MINOR) && \ + (2079 > 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 aa2aa553f9..b35c045691 100755 --- a/tools/precommit/check_file_properties.py +++ b/tools/precommit/check_file_properties.py @@ -61,6 +61,8 @@ FLAG_EXCEPTIONS = ( r"LIBXSMM_VERSION_MAJOR", r"LIBXSMM_VERSION_MINOR", r"LIBXSMM_VERSION_PATCH", + r"LIBXSMM_VERSION2", + r"LIBXSMM_VERSION3", r"LIBXSMM_VERSION4", r"__PW_CUDA_HIP_KERNELS", )