build fixes

Author: stephen-dixon

CMakeLists.txt

@@ -15,7 +15,7 @@ list(
 )
 
 # Specify C++ standard for all targets
-set( CMAKE_CXX_STANDARD 17 )
+set( CMAKE_CXX_STANDARD 20 )
 set( CMAKE_CXX_STANDARD_REQUIRED ON )
 set( CMAKE_CXX_EXTENSIONS OFF )
 
@@ -55,11 +55,15 @@ endif()
 include( FetchContent )
 FetchContent_Declare(
     libtokamap
-    GIT_REPOSITORY git@github.com:jholloc/libtokamap.git
-    GIT_TAG main
+    GIT_REPOSITORY https://github.com/ukaea/libtokamap.git
+    GIT_TAG develop
+    CMAKE_ARGS -DENABLE_TESTS=OFF
 )
 
 FetchContent_MakeAvailable( libtokamap )
 
+
 find_package( UDA REQUIRED )
 add_subdirectory( mapping_plugin )
+# add_subdirectory( geometry_map_plugin )
+# add_subdirectory( CUSTOM_MASTU_plugin )

mapping_plugin/CMakeLists.txt

@@ -8,11 +8,6 @@
 find_package( UDA 2.7.0 REQUIRED )
 find_package( Boost REQUIRED )
 
-# Specify C++ standard for all targets
-set( CMAKE_CXX_STANDARD 17 )
-set( CMAKE_CXX_STANDARD_REQUIRED ON )
-set( CMAKE_CXX_EXTENSIONS OFF )
-
 set( SOURCES
     src/uda_data_source.cpp
     src/uda_ram_cache.cpp
@@ -34,6 +29,7 @@ target_include_directories( libtokamap_uda_extension PRIVATE
     ${CMAKE_SOURCE_DIR}/libtokamap/src
 )
 target_link_libraries( libtokamap_uda_extension PRIVATE Boost::boost LibTokaMap::libtokamap )
+target_compile_features(libtokamap_uda_extension PUBLIC cxx_std_17)
 
 find_package( Boost REQUIRED )
 

mapping_plugin/config/libtokamap_config.json.in

@@ -1,8 +1,6 @@
 {
     "mapping_directory": "@CMAKE_INSTALL_PREFIX@/etc/JSON_mappings",
-    "globals_schema": "@CMAKE_BINARY_DIR@/_deps/libtokamap-src/schemas/mappings.schema.json",
-    "mapping_schema": "@CMAKE_BINARY_DIR@/_deps/libtokamap-src/schemas/globals.schema.json",
-    "mapping_config_schema": "@CMAKE_BINARY_DIR@/_deps/libtokamap-src/schemas/mappings.cfg.schema.json",
+    "schemas_directory": "@CMAKE_BINARY_DIR@/_deps/libtokamap-src/schemas",
     "cache_enabled": false,
     "cache_size": 100
 }

mapping_plugin/mapping_plugin.cpp

@@ -247,6 +247,8 @@ int JSONMappingPlugin::get(IDAM_PLUGIN_INTERFACE* plugin_interface)
         case UDA_TYPE_STRING:
             type_index = std::type_index{typeid(char)};
             break;
+        case UDA_TYPE_UNSIGNED_LONG64:
+            type_index = std::type_index{typeid(uint64_t)};
         default:
             break;
     }

mapping_plugin/src/uda_data_source.cpp

@@ -27,8 +27,9 @@
 
 #include "map_types/data_source_mapping.hpp"
 #include "map_types/map_arguments.hpp"
-#include "uda_ram_cache.hpp"
-#include "utils/ram_cache.hpp"
+// #include "uda_ram_cache.hpp"
+// #include "utils/ram_cache.hpp"
+#include "utils/typed_data_array.hpp"
 
 // TODO:
 //  - handle compressed dims

mapping_plugin/src/uda_plugin_helpers.cpp

@@ -19,6 +19,7 @@ std::unordered_map<std::string, UDA_TYPE> json_plugin::uda_type_map()
     static std::unordered_map<std::string, UDA_TYPE> type_map;
     if (type_map.empty()) {
         type_map = {{typeid(unsigned int).name(), UDA_TYPE_UNSIGNED_INT},
+                    {typeid(uint64_t).name(), UDA_TYPE_UNSIGNED_LONG64},
                     {typeid(int).name(), UDA_TYPE_INT},
                     {typeid(float).name(), UDA_TYPE_FLOAT},
                     {typeid(double).name(), UDA_TYPE_DOUBLE},
@@ -33,6 +34,7 @@ std::unordered_map<std::type_index, UDA_TYPE> json_plugin::uda_type_index_map()
     static std::unordered_map<std::type_index, UDA_TYPE> type_map;
     if (type_map.empty()) {
         type_map = {{std::type_index{ typeid(unsigned int) }, UDA_TYPE_UNSIGNED_INT},
+                    {std::type_index{ typeid(uint64_t) }, UDA_TYPE_UNSIGNED_LONG64},
                     {std::type_index{ typeid(int) }, UDA_TYPE_INT},
                     {std::type_index{ typeid(float) }, UDA_TYPE_FLOAT},
                     {std::type_index{ typeid(double) }, UDA_TYPE_DOUBLE},

mapping_plugin/src/uda_plugin_helpers.hpp

@@ -8,7 +8,7 @@
 #include <clientserver/udaStructs.h>
 #include <clientserver/udaTypes.h>
 
-#include "map_types/map_arguments.hpp"
+#include "utils/typed_data_array.hpp"
 
 namespace json_plugin
 {

mapping_plugin/test/CMakeLists.txt

@@ -6,10 +6,6 @@
 #     LANGUAGES CXX
 # )
 
-set( CMAKE_CXX_STANDARD 17 )
-set( CMAKE_CXX_STANDARD_REQUIRED ON )
-set( CMAKE_CXX_EXTENSIONS OFF )
-
 find_package( Boost REQUIRED )
 
 set( TEST_SOURCES
@@ -26,6 +22,7 @@ FetchContent_MakeAvailable( Catch2 )
 
 # Create test executable
 add_executable( mapping_plugin_tests ${TEST_SOURCES} )
+target_compile_features(mapping_plugin_tests PUBLIC cxx_std_17)
 
 # INCLUDE
 target_include_directories( mapping_plugin_tests PRIVATE