Move files around to make compilation happy.

liuliu · Jul 21, 2023 · a0958d0 · a0958d0
1 parent 4fe9899
commit a0958d0
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 38 deletions.
diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel
@@ -31,14 +31,14 @@ cc_library(
 )
 
 cc_library(
-  name = "metal_cpp_hdrs",
-  srcs = [
-    "3rdparty/metal-cpp/Dispatch.cpp",
-  ],
-  hdrs = [
-    "3rdparty/metal-cpp/Dispatch.hpp",
-    "3rdparty/metal-cpp/Metal.hpp",
-  ],
+	name = "metal_cpp_hdrs",
+	srcs = [
+		"nnc/mfa/3rdparty/metal-cpp/Dispatch.cpp",
+	],
+	hdrs = [
+		"nnc/mfa/3rdparty/metal-cpp/Dispatch.hpp",
+		"nnc/mfa/3rdparty/metal-cpp/Metal.hpp",
+	],
 )
 
 cc_library(
@@ -371,14 +371,14 @@ cuda_library(
 )
 
 cc_library(
-  name = "nnc_mfa_compat",
-  srcs = glob(["nnc/mfa/**/*.cpp"]),
-  hdrs = glob(["nnc/mfa/**/*.hpp"]),
-  copts = ccv_default_copts(),
-  deps = [
-    ":metal_cpp_hdrs",
-    ":nnc_headers"
-  ]
+	name = "nnc_mfa_compat",
+	srcs = glob(["nnc/mfa/**/*.cpp"]),
+	hdrs = glob(["nnc/mfa/**/*.hpp"]),
+	copts = ccv_default_copts(),
+	deps = [
+		":metal_cpp_hdrs",
+		":nnc_headers"
+	]
 )
 
 objc_library(
@@ -392,9 +392,9 @@ objc_library(
 	copts = ccv_default_copts(),
 	sdk_frameworks = ["Metal", "MetalPerformanceShaders", "MetalPerformanceShadersGraph"],
 	deps = [
-    ":nnc_mfa_compat",
-    ":nnc_headers",
-    ":SFMT_hdrs"
+		":nnc_mfa_compat",
+		":nnc_headers",
+		":SFMT_hdrs"
 	]
 )
 
@@ -440,7 +440,7 @@ objc_library(
 	copts = ccv_default_copts(),
 	deps = [
 		":nnc_headers",
-    ":nnc_mfa_compat",
+		":nnc_mfa_compat",
 		":nnc_mps_compat",
 	]
 )
@@ -540,7 +540,7 @@ cc_library(
 		"//conditions:default": []
 	}) + select({
 		"//config:have_mps": [
-      ":nnc_mfa_compat",
+			":nnc_mfa_compat",
 			":nnc_mps_compat",
 			":cmd_mps"
 		],

diff --git a/lib/configure.ac b/lib/configure.ac
@@ -191,13 +191,13 @@ AC_ARG_ENABLE(mps, [AS_HELP_STRING([--enable-mps], [Enable Metal support])], [mp
 if test "$mps_support" = yes; then
 	AC_MSG_RESULT(yes)
 	AC_SUBST(DEFINE_MACROS, ["$DEFINE_MACROS-D HAVE_MPS "])
-	AC_SUBST(MKLDFLAGS, ["$MKLDFLAGS-framework MetalPerformanceShaders -framework MetalPerformanceShadersGraph -framework Foundation -framework Metal "])
+	AC_SUBST(MKLDFLAGS, ["$MKLDFLAGS-framework MetalPerformanceShaders -framework MetalPerformanceShadersGraph -framework Foundation -framework Metal -lc++ "])
 	AC_SUBST(CUDA_SRCS, [""])
 	AC_SUBST(CUDA_COMPAT_LIB, [""])
 	AC_SUBST(CUDA_CMD_LIB, [""])
 else
 	AC_MSG_RESULT(no)
-  AC_SUBST(MFA_COMPAT_LIB, [""])
+	AC_SUBST(MFA_COMPAT_LIB, [""])
 	AC_SUBST(MPS_COMPAT_LIB, [""])
 	AC_SUBST(MPS_CMD_LIB, [""])
 fi

diff --git a/lib/nnc/cmd/sigmoid/mps/ccv_nnc_sigmoid_mps.m b/lib/nnc/cmd/sigmoid/mps/ccv_nnc_sigmoid_mps.m
@@ -39,7 +39,7 @@ static int _ccv_nnc_sigmoid_back(const ccv_nnc_cmd_t cmd, const ccv_nnc_hint_t h
 	const ccv_nnc_tensor_view_t* const b = (const ccv_nnc_tensor_view_t*)inputs[2];
 	ccv_nnc_tensor_view_t* const h = (ccv_nnc_tensor_view_t*)outputs[0];
 	@autoreleasepool {
-		MPSCommandBuffer* command_buffer = ccv_nnc_stream_context_get_command_buffer(stream_context);
+		MPSCommandBuffer* command_buffer = ccv_nnc_stream_context_start_mps_command_buffer(stream_context);
 		ccv_nnc_mps_graph_key_t key = ccv_nnc_mps_graph_key_new(cmd, hint, flags, inputs, input_size, outputs, output_size);
 		int indices[1];
 		MPSGraphExecutable* executable = ccv_nnc_mps_graph_executable_cache(key, indices, ^void (MPSGraph* graph, NSMutableArray<MPSGraphTensor*>* inputTensors, NSMutableArray<MPSGraphShapedType*>* inputShapedTypes, NSMutableArray<MPSGraphTensor*>* resultTensors) {
@@ -65,7 +65,7 @@ static int _ccv_nnc_sigmoid_back(const ccv_nnc_cmd_t cmd, const ccv_nnc_hint_t h
 		MPSGraphTensorData* data_b = ccv_nnc_mps_graph_tensor_data(b, b->info.dim, b->stride);
 		MPSGraphTensorData* data[] = {data_g, data_b};
 		ccv_nnc_mps_graph_executable_result(executable, command_buffer, @[data[indices[0]], data[indices[1]]], &h, (int*[]){ h->info.dim }, (int*[]){ h->stride }, 1);
-		ccv_nnc_stream_context_commit_command_buffer(stream_context, command_buffer);
+		ccv_nnc_stream_context_finish_mps_command_buffer(stream_context, command_buffer);
 	}
 	return CCV_NNC_EXEC_SUCCESS;
 }

diff --git a/lib/3rdparty/metal-cpp/Dispatch.cpp → lib/nnc/mfa/3rdparty/metal-cpp/Dispatch.cpp b/lib/3rdparty/metal-cpp/Dispatch.cpp → lib/nnc/mfa/3rdparty/metal-cpp/Dispatch.cpp
diff --git a/lib/3rdparty/metal-cpp/Dispatch.hpp → lib/nnc/mfa/3rdparty/metal-cpp/Dispatch.hpp b/lib/3rdparty/metal-cpp/Dispatch.hpp → lib/nnc/mfa/3rdparty/metal-cpp/Dispatch.hpp
diff --git a/lib/3rdparty/metal-cpp/Metal.hpp → lib/nnc/mfa/3rdparty/metal-cpp/Metal.hpp b/lib/3rdparty/metal-cpp/Metal.hpp → lib/nnc/mfa/3rdparty/metal-cpp/Metal.hpp
diff --git a/lib/nnc/mfa/Metal.cpp b/lib/nnc/mfa/Metal.cpp
@@ -2,4 +2,4 @@
 #define CA_PRIVATE_IMPLEMENTATION
 #define MTL_PRIVATE_IMPLEMENTATION
 
-#include "3rdparty/metal-cpp/Metal.hpp"
+#include "nnc/mfa/3rdparty/metal-cpp/Metal.hpp"
diff --git a/lib/nnc/mfa/ccv_nnc_mfa.hpp b/lib/nnc/mfa/ccv_nnc_mfa.hpp
@@ -6,8 +6,8 @@
 #include "ccv_nnc_mfa_gemm.hpp"
 
 #ifdef __cplusplus
-#include "3rdparty/metal-cpp/Dispatch.hpp"
-#include "3rdparty/metal-cpp/Metal.hpp"
+#include "nnc/mfa/3rdparty/metal-cpp/Dispatch.hpp"
+#include "nnc/mfa/3rdparty/metal-cpp/Metal.hpp"
 #include "ccv_nnc_mfa_error.hpp"
 
 namespace ccv {

diff --git a/lib/nnc/mfa/ccv_nnc_mfa_defines.hpp b/lib/nnc/mfa/ccv_nnc_mfa_defines.hpp
@@ -4,7 +4,7 @@
 // MARK: - Types
 
 #ifdef __cplusplus
-#include "3rdparty/metal-cpp/Metal.hpp"
+#include "nnc/mfa/3rdparty/metal-cpp/Metal.hpp"
 namespace ccv {
 namespace nnc {
 namespace mfa {

diff --git a/lib/nnc/mfa/ccv_nnc_mfa_error.hpp b/lib/nnc/mfa/ccv_nnc_mfa_error.hpp
@@ -1,7 +1,7 @@
 #ifndef GUARD_ccv_nnc_mfa_error_hpp
 #define GUARD_ccv_nnc_mfa_error_hpp
 
-#include "3rdparty/metal-cpp/Metal.hpp"
+#include "nnc/mfa/3rdparty/metal-cpp/Metal.hpp"
 
 // `std::cout` and `CACurrentMediaTime()` for profiling.
 #include <iostream>

diff --git a/lib/nnc/mfa/ccv_nnc_mfa_gemm.hpp b/lib/nnc/mfa/ccv_nnc_mfa_gemm.hpp
@@ -20,8 +20,8 @@ typedef struct {
 } ccv_nnc_mfa_gemm_params_t;
 
 #ifdef __cplusplus
-#include "3rdparty/metal-cpp/Dispatch.hpp"
-#include "3rdparty/metal-cpp/Metal.hpp"
+#include "nnc/mfa/3rdparty/metal-cpp/Dispatch.hpp"
+#include "nnc/mfa/3rdparty/metal-cpp/Metal.hpp"
 
 namespace ccv {
 namespace nnc {

diff --git a/lib/nnc/mfa/makefile b/lib/nnc/mfa/makefile
@@ -1,12 +1,12 @@
 include ../../config.mk
 
-CFLAGS := -O3 -Wall -I"../../" $(CFLAGS)
+CFLAGS := -std=c++17 -O3 -Wall -I"../../" $(CFLAGS)
 
-SRCS := "" # Not needed because CUDA is not accessible on Apple devices.
+SRCS := Metal.cpp ccv_nnc_mfa.cpp ccv_nnc_mfa_error.cpp ccv_nnc_mfa_gemm.cpp 3rdparty/metal-cpp/Dispatch.cpp
 
-SRC_OBJS := $(patsubst %.c,%.o,$(patsubst %.m,%.o,$(SRCS)))
+SRC_OBJS := $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SRCS)))
 
-.PHONY: release all lib clean libnnc-compat-mfa.o
+.PHONY: release all lib clean
 
 release: all
 
@@ -32,7 +32,7 @@ dep: .dep.mk
 .dep.mk: $(SRCS)
 	echo '' > .dep.mk
 	for SRC in $(patsubst %.c,,$^) ; do \
-		$(NVCC) $(NVFLAGS) -M $$SRC | sed -e 's/^.*\://g' | (echo "$${SRC%%.*}.o: \\" && cat) >> .dep.mk ; \
+		$(CC) $(CFLAGS) -M $$SRC | sed -e 's/^.*\://g' | (echo "$${SRC%%.*}.o: \\" && cat) >> .dep.mk ; \
 	done
 
 -include .dep.mk

diff --git a/lib/nnc/mps/makefile b/lib/nnc/mps/makefile
@@ -32,7 +32,7 @@ dep: .dep.mk
 .dep.mk: $(SRCS)
 	echo '' > .dep.mk
 	for SRC in $(patsubst %.c,,$^) ; do \
-		$(NVCC) $(NVFLAGS) -M $$SRC | sed -e 's/^.*\://g' | (echo "$${SRC%%.*}.o: \\" && cat) >> .dep.mk ; \
+		$(CC) $(CFLAGS) -M $$SRC | sed -e 's/^.*\://g' | (echo "$${SRC%%.*}.o: \\" && cat) >> .dep.mk ; \
 	done
 
 -include .dep.mk