[Refactor] Move functional out of experimental

libocca · Jan 17, 2021 · 47fd96f · 47fd96f
1 parent fd9ca3c
commit 47fd96f
Show file tree

Hide file tree

Showing 26 changed files with 52 additions and 52 deletions.
diff --git a/include/occa.hpp b/include/occa.hpp
@@ -3,6 +3,7 @@
 
 #include <occa/core.hpp>
 #include <occa/dtype.hpp>
+#include <occa/functional.hpp>
 #include <occa/types.hpp>
 #include <occa/utils.hpp>
 

diff --git a/include/occa/c/experimental.h b/include/occa/c/experimental.h
@@ -2,7 +2,6 @@
 #define OCCA_C_EXPERIMENTAL_HEADER
 
 #include <occa/c/experimental/kernelBuilder.h>
-#include <occa/c/experimental/scope.h>
 
 #ifdef OCCA_JIT
 #  undef OCCA_JIT

diff --git a/include/occa/c/experimental/kernelBuilder.h b/include/occa/c/experimental/kernelBuilder.h
@@ -3,7 +3,7 @@
 
 #include <occa/c/defines.h>
 #include <occa/c/types.h>
-#include <occa/c/experimental/scope.h>
+#include <occa/c/scope.h>
 
 OCCA_START_EXTERN_C
 

diff --git a/include/occa/c/experimental/scope.h → include/occa/c/scope.h b/include/occa/c/experimental/scope.h → include/occa/c/scope.h
diff --git a/include/occa/defines/occa.hpp b/include/occa/defines/occa.hpp
@@ -4,10 +4,10 @@
 #include <occa/defines/compiledDefines.hpp>
 
 #define OCCA_MAJOR_VERSION 1
-#define OCCA_MINOR_VERSION 0
-#define OCCA_PATCH_VERSION 9
-#define OCCA_VERSION       10009
-#define OCCA_VERSION_STR   "1.0.9"
+#define OCCA_MINOR_VERSION 2
+#define OCCA_PATCH_VERSION 0
+#define OCCA_VERSION       10200
+#define OCCA_VERSION_STR   "1.2.0"
 
 #define OKL_MAJOR_VERSION 1
 #define OKL_MINOR_VERSION 0

diff --git a/include/occa/defines/okl.hpp b/include/occa/defines/okl.hpp
@@ -1,7 +1,9 @@
-// Just in case someone wants to run with an older format than C99
-#ifndef OCCA_DISABLE_VARIADIC_MACROS
-#  ifndef OCCA_DEFINES_OKL_HEADER
-#  define OCCA_DEFINES_OKL_HEADER
+#ifndef OCCA_DEFINES_OKL_HEADER
+#define OCCA_DEFINES_OKL_HEADER
+
+#ifdef OCCA_JIT
+#  undef OCCA_JIT
+#endif
 
 #define OCCA_JIT(OKL_SCOPE, OKL_SOURCE)                 \
   do {                                                  \
@@ -12,5 +14,4 @@
     _occaJitKernelBuilder.run(OKL_SCOPE);               \
   } while (false)
 
-#  endif
 #endif
diff --git a/include/occa/experimental.hpp b/include/occa/experimental.hpp
@@ -1,7 +1,6 @@
 #ifndef OCCA_EXPERIMENTAL_HEADER
 #define OCCA_EXPERIMENTAL_HEADER
 
-#include <occa/experimental/functional.hpp>
 #include <occa/experimental/kernelBuilder.hpp>
 #include <occa/experimental/mpi.hpp>
 

diff --git a/include/occa/experimental/functional.hpp b/include/occa/experimental/functional.hpp
diff --git a/include/occa/experimental/kernelBuilder.hpp b/include/occa/experimental/kernelBuilder.hpp
@@ -2,7 +2,7 @@
 #define OCCA_EXPERIMENTAL_CORE_KERNELBUILDER_HEADER
 
 #include <occa/core/kernel.hpp>
-#include <occa/experimental/functional/scope.hpp>
+#include <occa/functional/scope.hpp>
 
 namespace occa {
   class kernelBuilder {

diff --git a/include/occa/functional.hpp b/include/occa/functional.hpp
@@ -0,0 +1,9 @@
+#ifndef OCCA_FUNCTIONAL_HEADER
+#define OCCA_FUNCTIONAL_HEADER
+
+#include <occa/functional/array.hpp>
+#include <occa/functional/function.hpp>
+#include <occa/functional/scope.hpp>
+#include <occa/functional/utils.hpp>
+
+#endif
diff --git a/...de/occa/experimental/functional/array.hpp → include/occa/functional/array.hpp b/...de/occa/experimental/functional/array.hpp → include/occa/functional/array.hpp
@@ -1,17 +1,17 @@
-#ifndef OCCA_EXPERIMENTAL_FUNCTIONAL_ARRAY_HEADER
-#define OCCA_EXPERIMENTAL_FUNCTIONAL_ARRAY_HEADER
+#ifndef OCCA_FUNCTIONAL_ARRAY_HEADER
+#define OCCA_FUNCTIONAL_ARRAY_HEADER
 
 #include <vector>
 
 #include <occa/defines/okl.hpp>
 #include <occa/dtype.hpp>
-#include <occa/experimental/functional/function.hpp>
+#include <occa/functional/function.hpp>
 #include <occa/experimental/kernelBuilder.hpp>
 
 namespace occa {
   class kernelArg;
 
-  enum reductionType {
+  enum class reductionType {
     sum,
     multiply,
     bitOr,

diff --git a/...occa/experimental/functional/function.hpp → include/occa/functional/function.hpp b/...occa/experimental/functional/function.hpp → include/occa/functional/function.hpp
@@ -1,11 +1,11 @@
-#ifndef OCCA_EXPERIMENTAL_FUNCTIONAL_FUNCTION_HEADER
-#define OCCA_EXPERIMENTAL_FUNCTIONAL_FUNCTION_HEADER
+#ifndef OCCA_FUNCTIONAL_FUNCTION_HEADER
+#define OCCA_FUNCTIONAL_FUNCTION_HEADER
 
 #include <functional>
 
-#include <occa/experimental/functional/functionDefinition.hpp>
-#include <occa/experimental/functional/scope.hpp>
-#include <occa/experimental/functional/utils.hpp>
+#include <occa/functional/functionDefinition.hpp>
+#include <occa/functional/scope.hpp>
+#include <occa/functional/utils.hpp>
 #include <occa/utils/hash.hpp>
 #include <occa/dtype.hpp>
 

diff --git a/...imental/functional/functionDefinition.hpp → ...de/occa/functional/functionDefinition.hpp b/...imental/functional/functionDefinition.hpp → ...de/occa/functional/functionDefinition.hpp
@@ -1,12 +1,12 @@
-#ifndef OCCA_EXPERIMENTAL_FUNCTIONAL_FUNCTIONDEFINITION_HEADER
-#define OCCA_EXPERIMENTAL_FUNCTIONAL_FUNCTIONDEFINITION_HEADER
+#ifndef OCCA_FUNCTIONAL_FUNCTIONDEFINITION_HEADER
+#define OCCA_FUNCTIONAL_FUNCTIONDEFINITION_HEADER
 
 #include <memory>
 #include <string>
 
 #include <occa/dtype.hpp>
 #include <occa/utils/hash.hpp>
-#include <occa/experimental/functional/scope.hpp>
+#include <occa/functional/scope.hpp>
 
 namespace occa {
   class functionDefinition;

diff --git a/...de/occa/experimental/functional/scope.hpp → include/occa/functional/scope.hpp b/...de/occa/experimental/functional/scope.hpp → include/occa/functional/scope.hpp
@@ -1,5 +1,5 @@
-#ifndef OCCA_EXPERIMENTAL_FUNCTIONAL_SCOPE_HEADER
-#define OCCA_EXPERIMENTAL_FUNCTIONAL_SCOPE_HEADER
+#ifndef OCCA_FUNCTIONAL_SCOPE_HEADER
+#define OCCA_FUNCTIONAL_SCOPE_HEADER
 
 #include <initializer_list>
 #include <map>

diff --git a/...de/occa/experimental/functional/utils.hpp → include/occa/functional/utils.hpp b/...de/occa/experimental/functional/utils.hpp → include/occa/functional/utils.hpp
@@ -1,5 +1,5 @@
-#ifndef OCCA_EXPERIMENTAL_FUNCTIONAL_UTILS_HEADER
-#define OCCA_EXPERIMENTAL_FUNCTIONAL_UTILS_HEADER
+#ifndef OCCA_FUNCTIONAL_UTILS_HEADER
+#define OCCA_FUNCTIONAL_UTILS_HEADER
 
 #define OCCA_FUNCTION(scope, lambda)             \
   ::occa::inferFunction(scope, lambda, #lambda)

diff --git a/src/c/experimental/scope.cpp → src/c/scope.cpp b/src/c/experimental/scope.cpp → src/c/scope.cpp
@@ -1,5 +1,5 @@
 #include <occa/internal/c/types.hpp>
-#include <occa/c/experimental/scope.h>
+#include <occa/c/scope.h>
 
 namespace occa {
   static void addToScope(occaScope scope,

diff --git a/src/core/kernel.cpp b/src/core/kernel.cpp
@@ -8,7 +8,7 @@
 #include <occa/internal/lang/builtins/types.hpp>
 #include <occa/internal/lang/parser.hpp>
 #include <occa/internal/utils/sys.hpp>
-#include <occa/internal/experimental/functional/functionStore.hpp>
+#include <occa/internal/functional/functionStore.hpp>
 
 namespace occa {
   //---[ kernel ]-----------------------

diff --git a/src/experimental/kernelBuilder.cpp b/src/experimental/kernelBuilder.cpp
@@ -5,7 +5,7 @@
 #include <occa/internal/utils/lex.hpp>
 #include <occa/internal/utils/string.hpp>
 #include <occa/experimental/kernelBuilder.hpp>
-#include <occa/experimental/functional/scope.hpp>
+#include <occa/functional/scope.hpp>
 
 namespace occa {
   kernelBuilder::kernelBuilder(const std::string &source_,

diff --git a/src/experimental/functional/function.cpp → src/functional/function.cpp b/src/experimental/functional/function.cpp → src/functional/function.cpp
@@ -1,5 +1,5 @@
-#include <occa/experimental/functional/function.hpp>
-#include <occa/internal/experimental/functional/functionStore.hpp>
+#include <occa/functional/function.hpp>
+#include <occa/internal/functional/functionStore.hpp>
 
 namespace occa {
   baseFunction::baseFunction(const occa::scope &scope_) :

diff --git a/...imental/functional/functionDefinition.cpp → src/functional/functionDefinition.cpp b/...imental/functional/functionDefinition.cpp → src/functional/functionDefinition.cpp
@@ -1,5 +1,5 @@
-#include <occa/experimental/functional/functionDefinition.hpp>
-#include <occa/internal/experimental/functional/functionStore.hpp>
+#include <occa/functional/functionDefinition.hpp>
+#include <occa/internal/functional/functionStore.hpp>
 #include <occa/internal/utils/lex.hpp>
 #include <occa/internal/utils/string.hpp>
 

diff --git a/src/experimental/functional/scope.cpp → src/functional/scope.cpp b/src/experimental/functional/scope.cpp → src/functional/scope.cpp
@@ -1,6 +1,6 @@
 #include <sstream>
 
-#include <occa/experimental/functional/scope.hpp>
+#include <occa/functional/scope.hpp>
 
 namespace occa {
   scope::scope() {}

diff --git a/src/occa/internal/c/types.hpp b/src/occa/internal/c/types.hpp
@@ -2,7 +2,7 @@
 #define OCCA_INTERNAL_C_TYPES_HEADER
 
 #include <occa/core.hpp>
-#include <occa/experimental/functional/scope.hpp>
+#include <occa/functional/scope.hpp>
 #include <occa/experimental/kernelBuilder.hpp>
 #include <occa/internal/utils/sys.hpp>
 

diff --git a/...experimental/functional/functionStore.cpp → ...cca/internal/functional/functionStore.cpp b/...experimental/functional/functionStore.cpp → ...cca/internal/functional/functionStore.cpp
@@ -1,4 +1,4 @@
-#include <occa/internal/experimental/functional/functionStore.hpp>
+#include <occa/internal/functional/functionStore.hpp>
 
 namespace occa {
   store_t<hash_t, functionDefinition> functionStore;

diff --git a/...experimental/functional/functionStore.hpp → ...cca/internal/functional/functionStore.hpp b/...experimental/functional/functionStore.hpp → ...cca/internal/functional/functionStore.hpp
@@ -3,7 +3,7 @@
 
 #include <occa/utils/hash.hpp>
 #include <occa/internal/utils/store.hpp>
-#include <occa/experimental/functional/functionDefinition.hpp>
+#include <occa/functional/functionDefinition.hpp>
 
 namespace occa {
   extern store_t<hash_t, functionDefinition> functionStore;

diff --git a/tests/src/c/kernel.cpp b/tests/src/c/kernel.cpp
@@ -1,7 +1,7 @@
 #define OCCA_DISABLE_VARIADIC_MACROS
 
-#include <occa.hpp>
 #include <occa.h>
+#include <occa.hpp>
 
 #include <occa/internal/io.hpp>
 #include <occa/internal/c/types.hpp>

diff --git a/tests/src/experimental/functional/array.cpp → tests/src/functional/array.cpp b/tests/src/experimental/functional/array.cpp → tests/src/functional/array.cpp
@@ -1,6 +1,6 @@
 #include <occa.hpp>
-#include <occa/experimental.hpp>
-#include <occa/internal/experimental/functional/functionStore.hpp>
+#include <occa/functional.hpp>
+#include <occa/internal/functional/functionStore.hpp>
 #include <occa/internal/utils/testing.hpp>
 
 class context {