refactor(schema): merge common with local, ref #149

alpaca-core · Oct 17, 2024 · e8d2e27 · e8d2e27
1 parent f640927
commit e8d2e27
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 12 deletions.
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -10,7 +10,6 @@ endif()
 # public
 add_subdirectory(astl)
 add_subdirectory(xxhash-cpp)
-add_subdirectory(schema)
 
 if(AC_BUILD_TESTS OR AC_BUILD_EXAMPLES OR AC_BUILD_POC)
     add_subdirectory(ac-repo-root)

diff --git a/inference/dummy/local/code/ac/local/DummyModelSchema.hpp b/inference/dummy/local/code/ac/local/DummyModelSchema.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Alpaca Core
 // SPDX-License-Identifier: MIT
 //
-#include <ac/local/ModelSchema.hpp>
+#include <ac/schema/ModelSchema.hpp>
 
 namespace ac::local::schema {
 

diff --git a/inference/dummy/local/tools/generate-schema.cpp b/inference/dummy/local/tools/generate-schema.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 //
 #include <ac/local/DummyModelSchema.hpp>
-#include <ac/local/ModelSchemaGenHelper.hpp>
+#include <ac/schema/ModelSchemaGenHelper.hpp>
 
 int main(int argc, char** argv) {
     using namespace ac::local::schema;

diff --git a/inference/llama.cpp/local/code/ac/local/LlamaModelSchema.hpp b/inference/llama.cpp/local/code/ac/local/LlamaModelSchema.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Alpaca Core
 // SPDX-License-Identifier: MIT
 //
-#include <ac/local/ModelSchema.hpp>
+#include <ac/schema/ModelSchema.hpp>
 
 namespace ac::local::schema {
 

diff --git a/inference/llama.cpp/local/tools/generate-schema.cpp b/inference/llama.cpp/local/tools/generate-schema.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 //
 #include <ac/local/LlamaModelSchema.hpp>
-#include <ac/local/ModelSchemaGenHelper.hpp>
+#include <ac/schema/ModelSchemaGenHelper.hpp>
 
 int main(int argc, char** argv) {
     using namespace ac::local::schema;

diff --git a/inference/whisper/local/code/ac/local/WhisperModelSchema.hpp b/inference/whisper/local/code/ac/local/WhisperModelSchema.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Alpaca Core
 // SPDX-License-Identifier: MIT
 //
-#include <ac/local/ModelSchema.hpp>
+#include <ac/schema/ModelSchema.hpp>
 
 namespace ac::local::schema {
 

diff --git a/inference/whisper/local/tools/generate-schema.cpp b/inference/whisper/local/tools/generate-schema.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 //
 #include <ac/local/WhisperModelSchema.hpp>
-#include <ac/local/ModelSchemaGenHelper.hpp>
+#include <ac/schema/ModelSchemaGenHelper.hpp>
 
 int main(int argc, char** argv) {
     using namespace ac::local::schema;

diff --git a/local/CMakeLists.txt b/local/CMakeLists.txt
@@ -3,3 +3,4 @@
 #
 add_subdirectory(code)
 ac_add_test_subdir()
+add_subdirectory(schema)
diff --git a/common/schema/CMakeLists.txt → local/schema/CMakeLists.txt b/common/schema/CMakeLists.txt → local/schema/CMakeLists.txt
@@ -1,13 +1,12 @@
 # Copyright (c) Alpaca Core
 # SPDX-License-Identifier: MIT
 #
-ac_dep(nl-json)
 ac_dep(magic_enum)
 
 add_library(ac-schema INTERFACE)
 add_library(ac::schema ALIAS ac-schema)
 target_link_libraries(ac-schema INTERFACE
-    nlohmann_json::nlohmann_json
+    ac::dict
     magic_enum::magic_enum
 )
 target_include_directories(ac-schema INTERFACE code)

diff --git a/local/code/ac/local/ModelSchema.hpp → local/schema/code/ac/schema/ModelSchema.hpp b/local/code/ac/local/ModelSchema.hpp → local/schema/code/ac/schema/ModelSchema.hpp
@@ -3,7 +3,7 @@
 //
 #pragma once
 #include <ac/Dict.hpp>
-#include <ac/schema/SchemaItem.hpp>
+#include "SchemaItem.hpp"
 #include <astl/tuple_util.hpp>
 
 // here we use tuples to define instances within a model and operations within an instance

diff --git a/local/code/ac/local/ModelSchemaGenHelper.hpp → ...a/code/ac/schema/ModelSchemaGenHelper.hpp b/local/code/ac/local/ModelSchemaGenHelper.hpp → ...a/code/ac/schema/ModelSchemaGenHelper.hpp
diff --git a/common/schema/code/ac/schema/SchemaEnum.hpp → local/schema/code/ac/schema/SchemaEnum.hpp b/common/schema/code/ac/schema/SchemaEnum.hpp → local/schema/code/ac/schema/SchemaEnum.hpp
diff --git a/common/schema/code/ac/schema/SchemaItem.hpp → local/schema/code/ac/schema/SchemaItem.hpp b/common/schema/code/ac/schema/SchemaItem.hpp → local/schema/code/ac/schema/SchemaItem.hpp
diff --git a/common/schema/test/CMakeLists.txt → local/schema/test/CMakeLists.txt b/common/schema/test/CMakeLists.txt → local/schema/test/CMakeLists.txt
@@ -7,3 +7,4 @@ endmacro()
 
 schema_test(SchemaItem)
 schema_test(SchemaEnum)
+schema_test(ModelSchema)
diff --git a/local/test/t-ModelSchema.cpp → local/schema/test/t-ModelSchema.cpp b/local/test/t-ModelSchema.cpp → local/schema/test/t-ModelSchema.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Alpaca Core
 // SPDX-License-Identifier: MIT
 //
-#include <ac/local/ModelSchema.hpp>
+#include <ac/schema/ModelSchema.hpp>
 #include <doctest/doctest.h>
 
 using namespace ac::local::schema;

diff --git a/common/schema/test/t-SchemaEnum.cpp → local/schema/test/t-SchemaEnum.cpp b/common/schema/test/t-SchemaEnum.cpp → local/schema/test/t-SchemaEnum.cpp
diff --git a/common/schema/test/t-SchemaItem.cpp → local/schema/test/t-SchemaItem.cpp b/common/schema/test/t-SchemaItem.cpp → local/schema/test/t-SchemaItem.cpp
diff --git a/local/test/CMakeLists.txt b/local/test/CMakeLists.txt
@@ -7,4 +7,3 @@ endmacro()
 
 add_local_test(ProgressCb)
 add_local_test(ModelFactory)
-add_local_test(ModelSchema)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ endmacro()

		schema_test(SchemaItem)
		schema_test(SchemaEnum)
		schema_test(ModelSchema)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ endmacro()

		add_local_test(ProgressCb)
		add_local_test(ModelFactory)
		add_local_test(ModelSchema)