arrayfire · 9prady9 · Mar 12, 2020 · Mar 2, 2020 · Mar 3, 2020
diff --git a/src/backend/common/CMakeLists.txt b/src/backend/common/CMakeLists.txt
@@ -52,6 +52,7 @@ target_sources(afcommon_interface
     ${CMAKE_CURRENT_SOURCE_DIR}/half.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/host_memory.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/host_memory.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/internal_enums.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_type.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/module_loading.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/sparse_helpers.hpp

diff --git a/src/backend/common/defines.hpp b/src/backend/common/defines.hpp
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <common/internal_enums.hpp>
+
 #include <mutex>
 #include <string>
 
@@ -41,22 +43,6 @@ inline std::string clipFilePath(std::string path, std::string str) {
 #define __AF_FILENAME__ (clipFilePath(__FILE__, "src/").c_str())
 #endif
 
-typedef enum {
-    AF_BATCH_UNSUPPORTED = -1, /* invalid inputs */
-    AF_BATCH_NONE,             /* one signal, one filter   */
-    AF_BATCH_LHS,              /* many signal, one filter  */
-    AF_BATCH_RHS,              /* one signal, many filter  */
-    AF_BATCH_SAME,             /* signal and filter have same batch size */
-    AF_BATCH_DIFF,             /* signal and filter have different batch size */
-} AF_BATCH_KIND;
-
-enum class kJITHeuristics {
-    Pass                = 0, /* no eval necessary */
-    TreeHeight          = 1, /* eval due to jit tree height */
-    KernelParameterSize = 2, /* eval due to many kernel parameters */
-    MemoryPressure      = 3  /* eval due to memory pressure */
-};
-
 #ifdef OS_WIN
 #include <Windows.h>
 using LibHandle = HMODULE;

diff --git a/src/backend/common/internal_enums.hpp b/src/backend/common/internal_enums.hpp
@@ -0,0 +1,22 @@
+/*******************************************************
+ * Copyright (c) 2020, ArrayFire
+ * All rights reserved.
+ *
+ * This file is distributed under 3-clause BSD license.
+ * The complete license agreement can be obtained at:
+ * http://arrayfire.com/licenses/BSD-3-Clause
+ ********************************************************/
+
+#pragma once
+
+// TODO AF_BATCH_UNSUPPORTED is not required and shouldn't happen
+//      Code changes are required to handle all cases properly
+//      and this enum value should be removed.
+typedef enum {
+    AF_BATCH_UNSUPPORTED = -1, /* invalid inputs */
+    AF_BATCH_NONE,             /* one signal, one filter   */
+    AF_BATCH_LHS,              /* many signal, one filter  */
+    AF_BATCH_RHS,              /* one signal, many filter  */
+    AF_BATCH_SAME,             /* signal and filter have same batch size */
+    AF_BATCH_DIFF,             /* signal and filter have different batch size */
+} AF_BATCH_KIND;
diff --git a/src/backend/common/jit/Node.hpp b/src/backend/common/jit/Node.hpp
@@ -19,6 +19,13 @@
 #include <unordered_map>
 #include <vector>
 
+enum class kJITHeuristics {
+    Pass                = 0, /* no eval necessary */
+    TreeHeight          = 1, /* eval due to jit tree height */
+    KernelParameterSize = 2, /* eval due to many kernel parameters */
+    MemoryPressure      = 3  /* eval due to memory pressure */
+};
+
 namespace common {
 class Node;
 struct Node_ids;

diff --git a/src/backend/cpu/Array.hpp b/src/backend/cpu/Array.hpp
@@ -12,6 +12,7 @@
 #include <Param.hpp>
 #include <common/ArrayInfo.hpp>
 #include <common/MemoryManagerBase.hpp>
+#include <common/jit/Node.hpp>
 #include <jit/Node.hpp>
 #include <memory.hpp>
 #include <platform.hpp>