Prevent issue #390.

samples/transpose/transpose.c

@@ -17,17 +17,9 @@
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
-#if defined(__MKL)
-# include <mkl_trans.h>
-#elif defined(__OPENBLAS77)
-# include <f77blas.h>
-#endif
 #if defined(_OPENMP)
 # include <omp.h>
 #endif
-#if defined(LIBXSMM_OFFLOAD_TARGET)
-# pragma offload_attribute(pop)
-#endif
 
 #if !defined(ELEM_TYPE)
 # define ELEM_TYPE double
@@ -50,6 +42,7 @@
 #if defined(__BLAS) && (0 != __BLAS) && \
   (LIBXSMM_EQUAL(ELEM_TYPE, float) || LIBXSMM_EQUAL(ELEM_TYPE, double))
 # if defined(__MKL)
+#   include <mkl_trans.h>
 #   define OTRANS_GOLD(M, N, A, LDI, B, LDO) \
       LIBXSMM_CONCATENATE(mkl_, LIBXSMM_TPREFIX(ELEM_TYPE, omatcopy))('C', 'T', \
         (size_t)(*(M)), (size_t)(*(N)), (ELEM_TYPE)1, A, (size_t)(*(LDI)), B, (size_t)(*(LDO)))
@@ -59,7 +52,8 @@
 #   if !defined(USE_REFERENCE)
 #     define USE_REFERENCE
 #   endif
-# elif defined(__OPENBLAS77)
+# elif defined(__OPENBLAS77) && 0/* issue #390 */
+#   include <f77blas.h>
 #   define OTRANS_GOLD(M, N, A, LDI, B, LDO) { \
       /*const*/char otrans_gold_tc_ = 'C', otrans_gold_tt_ = 'T'; \
       /*const*/ELEM_TYPE otrans_gold_alpha_ = 1; \
@@ -79,6 +73,9 @@
 #   endif
 # endif
 #endif
+#if defined(LIBXSMM_OFFLOAD_TARGET)
+# pragma offload_attribute(pop)
+#endif
 
 
 LIBXSMM_INLINE LIBXSMM_RETARGETABLE ELEM_TYPE initial_value(libxsmm_blasint i, libxsmm_blasint j, libxsmm_blasint ld)

tests/matcopy.c

@@ -29,7 +29,7 @@
 #   define MATCOPY_GOLD(M, N, A, LDI, B, LDO) \
       LIBXSMM_CONCATENATE(mkl_, LIBXSMM_TPREFIX(ELEM_TYPE, omatcopy))('C', 'n', \
         (size_t)(*(M)), (size_t)(*(N)), (ELEM_TYPE)1, A, (size_t)(*(LDI)), B, (size_t)(*(LDO)))
-# elif defined(__OPENBLAS77)
+# elif defined(__OPENBLAS77) && 0/* issue #390 */
 #   include <f77blas.h>
 #   define MATCOPY_GOLD(M, N, A, LDI, B, LDO) { \
       /*const*/char matcopy_gold_tc_ = 'C', matcopy_gold_tt_ = 'n'; \

version.txt

@@ -1 +1 @@
-release-1.16.1
+release-1.16-13