move activations out of common.hpp

Author: dkhaldi

sycl/test-e2e/Matrix/common.hpp

@@ -36,12 +36,6 @@ template <typename T, size_t NUM_ROWS, size_t NUM_COLS> struct big_matrix {
   big_matrix(T *data) : mat(data) {}
 };
 
-enum class Activation {
-  ReLU,
-  Sigmoid,
-  None,
-};
-
 float make_fp32(bfloat16 x) {
   unsigned int y = *((int *)&x);
   y = y << 16;
@@ -169,8 +163,7 @@ void matrix_apply(unsigned int rows, unsigned int cols, T *mat, F op) {
       mat[i * cols + j] = op(mat[i * cols + j]);
 }
 
-template <Activation act = Activation::None, typename T1, typename T2,
-          bool exact = false>
+template <typename T1, typename T2, bool exact = false>
 bool matrix_compare(unsigned int rows, unsigned int cols, T1 *src, T2 *ref) {
   for (int i = 0; i < rows; i++) {
     for (int j = 0; j < cols; j++) {

sycl/test-e2e/Matrix/joint_matrix_activation_impl.hpp

@@ -15,6 +15,12 @@ constexpr size_t TM = 8;
 constexpr size_t TN = 16;
 constexpr size_t TK = 16;
 
+enum class Activation {
+  ReLU,
+  Sigmoid,
+  None,
+};
+
 template <typename T> T ReLU(T x) { return sycl::max(static_cast<T>(0), x); }
 
 template <typename T> T Sigmoid(T x) {
@@ -105,9 +111,7 @@ int main() {
   big_matrix<bfloat16, MATRIX_M, MATRIX_K> MA((bfloat16 *)&A);
 
   matrix_activation_copy<Activation::None>(MC, MA);
-  bool res0 = matrix_compare(MATRIX_M, MATRIX_N, (bfloat16 *)A, (float *)C);
-  bool res = matrix_compare<Activation::None>(MATRIX_M, MATRIX_N, (bfloat16 *)A,
-                                              (float *)C);
+  bool res = matrix_compare(MATRIX_M, MATRIX_N, (bfloat16 *)A, (float *)C);
   std::cout << (res ? "Copy passed" : "Copy failed") << std::endl;
 
   matrix_activation_copy<Activation::ReLU>(MC, MA);