Move memoryPool from occa::experimental to occa namespace

libocca · Dec 21, 2023 · 6390b2d · 6390b2d
1 parent ec9d90c
commit 6390b2d
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 28 deletions.
diff --git a/examples/cpp/17_memory_pool/main.cpp b/examples/cpp/17_memory_pool/main.cpp
@@ -34,7 +34,7 @@ int main(int argc, const char **argv) {
   occa::json properties;
   properties["verbose"] = args["options/verbose"];
 
-  occa::experimental::memoryPool memPool = device.createMemoryPool(properties);
+  occa::memoryPool memPool = device.createMemoryPool(properties);
 
   int alignment = memPool.alignment();
 

diff --git a/include/occa.h b/include/occa.h
@@ -8,6 +8,7 @@
 #include <occa/c/json.h>
 #include <occa/c/kernel.h>
 #include <occa/c/memory.h>
+#include <occa/c/memoryPool.h>
 
 // Just in case someone wants to run with an older format than C99
 #ifndef OCCA_DISABLE_VARIADIC_MACROS

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/memoryPool.h>
 
 #ifdef OCCA_JIT
 #  undef OCCA_JIT

diff --git a/include/occa/c/experimental/memoryPool.h → include/occa/c/memoryPool.h b/include/occa/c/experimental/memoryPool.h → include/occa/c/memoryPool.h
diff --git a/include/occa/core.hpp b/include/occa/core.hpp
@@ -6,6 +6,7 @@
 #include <occa/core/kernel.hpp>
 #include <occa/core/kernelArg.hpp>
 #include <occa/core/memory.hpp>
+#include <occa/core/memoryPool.hpp>
 #include <occa/core/stream.hpp>
 #include <occa/core/streamTag.hpp>
 

diff --git a/include/occa/core/base.hpp b/include/occa/core/base.hpp
@@ -16,6 +16,7 @@
 #include <occa/core/device.hpp>
 #include <occa/core/kernel.hpp>
 #include <occa/core/memory.hpp>
+#include <occa/core/memoryPool.hpp>
 #include <occa/core/stream.hpp>
 #include <occa/core/streamTag.hpp>
 
@@ -44,7 +45,7 @@ namespace occa {
 
   streamTag tagStream();
 
-  experimental::memoryPool createMemoryPool(const occa::json &props = occa::json());
+  memoryPool createMemoryPool(const occa::json &props = occa::json());
   //====================================
 
   //---[ Kernel Functions ]-------------

diff --git a/include/occa/core/device.hpp b/include/occa/core/device.hpp
@@ -742,7 +742,7 @@ namespace occa {
      *
      * @endDoc
      */
-    experimental::memoryPool createMemoryPool(const occa::json &props = occa::json());
+    memoryPool createMemoryPool(const occa::json &props = occa::json());
 
     //  |===============================
 

diff --git a/include/occa/core/memoryPool.hpp b/include/occa/core/memoryPool.hpp
@@ -9,8 +9,6 @@ namespace occa {
   class modeDevice_t; class device;
   class modeMemoryPool_t;
 
-  namespace experimental {
-
   class memoryPool : public gc::ringEntry_t {
     friend class occa::modeMemoryPool_t;
 
@@ -141,7 +139,7 @@ namespace occa {
      *
      * @endDoc
      */
-    bool operator == (const occa::experimental::memoryPool &other) const;
+    bool operator == (const occa::memoryPool &other) const;
 
     /**
      * @startDoc{operator_equals[1]}
@@ -154,7 +152,7 @@ namespace occa {
      *
      * @endDoc
      */
-    bool operator != (const occa::experimental::memoryPool &other) const;
+    bool operator != (const occa::memoryPool &other) const;
 
     /**
      * @startDoc{resize}
@@ -253,7 +251,6 @@ namespace occa {
     void setAlignment(const udim_t alignment);
   };
 
-  }
 }
 
 #include "memoryPool.tpp"

diff --git a/include/occa/core/memoryPool.tpp b/include/occa/core/memoryPool.tpp
@@ -1,8 +1,6 @@
 namespace occa {
-namespace experimental {
   template <class T>
   occa::memory memoryPool::reserve(const dim_t entries) {
     return reserve(entries, occa::dtype::get<T>());
   }
 }
-}
diff --git a/src/c/base.cpp b/src/c/base.cpp
@@ -201,7 +201,7 @@ occaMemory occaTypedWrapMemory(const void *ptr,
 
 //---[ MemoryPool ]---------------------
 occaMemoryPool occaCreateMemoryPool(occaJson props) {
-  occa::experimental::memoryPool memPool;
+  occa::memoryPool memPool;
   if (occa::c::isDefault(props)) {
     memPool = occa::createMemoryPool();
   } else {

diff --git a/src/c/device.cpp b/src/c/device.cpp
@@ -263,7 +263,7 @@ occaMemoryPool occaDeviceCreateMemoryPool(occaDevice device,
                                           occaJson props) {
   occa::device device_ = occa::c::device(device);
 
-  occa::experimental::memoryPool memoryPool;
+  occa::memoryPool memoryPool;
   if (occa::c::isDefault(props)) {
     memoryPool = device_.createMemoryPool();
   } else {

diff --git a/src/c/experimental/memoryPool.cpp → src/c/memoryPool.cpp b/src/c/experimental/memoryPool.cpp → src/c/memoryPool.cpp
@@ -1,7 +1,7 @@
 #include <occa/internal/c/types.hpp>
 #include <occa/c/dtype.h>
 #include <occa/c/memory.h>
-#include <occa/c/experimental/memoryPool.h>
+#include <occa/c/memoryPool.h>
 
 OCCA_START_EXTERN_C
 
@@ -57,7 +57,7 @@ occaMemory occaMemoryPoolReserve(occaDevice device,
 occaMemory occaMemoryPoolTypedReserve(occaMemoryPool memoryPool,
                                       const occaUDim_t entries,
                                       const occaDtype dtype) {
-  occa::experimental::memoryPool memoryPool_ = occa::c::memoryPool(memoryPool);
+  occa::memoryPool memoryPool_ = occa::c::memoryPool(memoryPool);
   const occa::dtype_t &dtype_ = occa::c::dtype(dtype);
 
   occa::memory memory = memoryPool_.reserve(entries, dtype_);

diff --git a/src/core/base.cpp b/src/core/base.cpp
@@ -94,7 +94,7 @@ namespace occa {
     return getDevice().tagStream();
   }
 
-  experimental::memoryPool createMemoryPool(const occa::json &props) {
+  memoryPool createMemoryPool(const occa::json &props) {
     return getDevice().createMemoryPool(props);
   }
 

diff --git a/src/occa/internal/c/types.cpp b/src/occa/internal/c/types.cpp
@@ -247,7 +247,7 @@ namespace occa {
       return oType;
     }
 
-    occaType newOccaType(occa::experimental::memoryPool memoryPool) {
+    occaType newOccaType(occa::memoryPool memoryPool) {
       occa::modeMemoryPool_t *modeMemoryPool = memoryPool.getModeMemoryPool();
       if (!modeMemoryPool) {
         return occaUndefined;
@@ -386,13 +386,13 @@ namespace occa {
       return occa::memory((occa::modeMemory_t*) value.value.ptr);
     }
 
-    occa::experimental::memoryPool memoryPool(occaType value) {
+    occa::memoryPool memoryPool(occaType value) {
       if (occaIsUndefined(value)) {
-        return occa::experimental::memoryPool();
+        return occa::memoryPool();
       }
       OCCA_ERROR("Input is not an occaMemoryPool",
                  value.type == typeType::memoryPool);
-      return occa::experimental::memoryPool((occa::modeMemoryPool_t*) value.value.ptr);
+      return occa::memoryPool((occa::modeMemoryPool_t*) value.value.ptr);
     }
 
     occa::stream stream(occaType value) {
@@ -981,7 +981,7 @@ void occaPrintTypeInfo(occaType value) {
         info["type"]  = "memoryPool";
         info["value"] = (void*) value.value.ptr;
 
-        occa::experimental::memoryPool memPool = occa::c::memoryPool(value);
+        occa::memoryPool memPool = occa::c::memoryPool(value);
         if (memPool.isInitialized()) {
           info["mode"]   = memPool.mode();
           info["props"]  = memPool.properties();

diff --git a/src/occa/internal/c/types.hpp b/src/occa/internal/c/types.hpp
@@ -98,7 +98,7 @@ namespace occa {
     occaType newOccaType(occa::device device);
     occaType newOccaType(occa::kernel kernel);
     occaType newOccaType(occa::memory memory);
-    occaType newOccaType(occa::experimental::memoryPool memoryPool);
+    occaType newOccaType(occa::memoryPool memoryPool);
     occaType newOccaType(occa::stream stream);
     occaType newOccaType(occa::streamTag streamTag);
 
@@ -118,7 +118,7 @@ namespace occa {
     occa::kernel kernel(occaType value);
     occa::kernelBuilder kernelBuilder(occaType value);
     occa::memory memory(occaType value);
-    occa::experimental::memoryPool memoryPool(occaType value);
+    occa::memoryPool memoryPool(occaType value);
     occa::stream stream(occaType value);
     occa::streamTag streamTag(occaType value);
 

diff --git a/src/occa/internal/core/memoryPool.cpp b/src/occa/internal/core/memoryPool.cpp
@@ -5,8 +5,6 @@
 
 namespace occa {
 
-  using experimental::memoryPool;
-
   modeMemoryPool_t::modeMemoryPool_t(modeDevice_t *modeDevice_,
                                      const occa::json &properties_) :
     modeBuffer_t(modeDevice_, 0, properties_),

diff --git a/src/occa/internal/core/memoryPool.hpp b/src/occa/internal/core/memoryPool.hpp
@@ -6,7 +6,6 @@
 #include <set>
 
 namespace occa {
-  using experimental::memoryPool;
 
   class modeMemoryPool_t : public modeBuffer_t {
    public:

diff --git a/tests/src/c/memoryPool.cpp b/tests/src/c/memoryPool.cpp
@@ -2,7 +2,6 @@
 
 #include <occa.hpp>
 #include <occa.h>
-#include <occa/c/experimental.h>
 #include <occa/internal/c/types.hpp>
 #include <occa/internal/utils/testing.hpp>
 

diff --git a/tests/src/core/memoryPool.cpp b/tests/src/core/memoryPool.cpp
@@ -23,7 +23,7 @@ void testReserve() {
     {"mode", "Serial"}
   });
 
-  occa::experimental::memoryPool memPool = device.createMemoryPool();
+  occa::memoryPool memPool = device.createMemoryPool();
 
   /*Set aligment to 5*sizeof(float) bytes*/
   memPool.setAlignment(5 * sizeof(float));