From 031978d2647cf08316858baf29c84ebba9c3133e Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Wed, 16 Nov 2016 14:04:33 -0600 Subject: [PATCH] Fixed inactive trsm_r blocksize constraint code. Details: - Changed a cpp macro that was meant to prevent using certain trsm_r code if BLIS_RELAX_MCNR_NCMR_CONSTRAINTS was defined. It was actually coded incorrectly at first. I've now fixed its location and changed its consequence to a compile-time #error message. --- frame/3/trsm/bli_trsm_front.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frame/3/trsm/bli_trsm_front.c b/frame/3/trsm/bli_trsm_front.c index c38a193f8..eda248b6b 100644 --- a/frame/3/trsm/bli_trsm_front.c +++ b/frame/3/trsm/bli_trsm_front.c @@ -86,9 +86,6 @@ void bli_trsm_front } #if 0 - // NOTE: Enabling this code requires that BLIS be configured with - // BLIS_RELAX_MCNR_NCMR_CONSTRAINTS defined. -#ifdef BLIS_RELAX_MCNR_NCMR_CONSTRAINTS // If A is being solved against from the right, transpose all operands // so that we can perform the computation as if A were being solved @@ -101,9 +98,14 @@ void bli_trsm_front bli_obj_induce_trans( c_local ); } -#endif #else + // NOTE: Enabling this code requires that BLIS NOT be configured with + // BLIS_RELAX_MCNR_NCMR_CONSTRAINTS defined. +#ifdef BLIS_RELAX_MCNR_NCMR_CONSTRAINTS + #error "BLIS_RELAX_MCNR_NCMR_CONSTRAINTS must not be defined for current trsm_r implementation." +#endif + // If A is being solved against from the right, swap A and B so that // the triangular matrix will actually be on the right. if ( bli_is_right( side ) )