New makefile working for bridge. Going to look into CMake for entire project.

Author: Iainmon

bridge/Bridge

@@ -1,11 +1,17 @@
 
+CXX = /usr/bin/clang++
+PWD = $(shell pwd)
+LIBTORCH = $(PWD)/libtorch
+
 all: bridge.o Bridge
 
 bridge.o: lib/bridge.cpp include/bridge.h 
-	g++ -c lib/bridge.cpp -I include -o bridge.o -I /Users/iainmoncrief/Documents/Github/ChAI/bridge/libtorch/include/torch/csrc/api/include -I /Users/iainmoncrief/Documents/Github/ChAI/bridge/libtorch/include --std=c++17
+	$(CXX) -c lib/bridge.cpp -I include -o bridge.o -I $(LIBTORCH)/include/torch/csrc/api/include -I $(LIBTORCH)/include --std=c++17
+
+# g++ -c lib/bridge.cpp -I include -o bridge.o -I /Users/iainmoncrief/Documents/Github/ChAI/bridge/libtorch/include/torch/csrc/api/include -I /Users/iainmoncrief/Documents/Github/ChAI/bridge/libtorch/include --std=c++17
 
 Bridge: bridge.o lib/Bridge.chpl
-	chpl lib/Bridge.chpl include/bridge.h bridge.o -L /Users/iainmoncrief/Documents/Github/ChAI/bridge/libtorch/lib -ltorch -ltorch_cpu -lc10 --ldflags "-Wl,-rpath,/Users/iainmoncrief/Documents/Github/ChAI/bridge/libtorch/lib"
+	chpl lib/Bridge.chpl include/bridge.h bridge.o -L $(LIBTORCH)/lib -ltorch -ltorch_cpu -lc10 --ldflags "-Wl,-rpath,$(LIBTORCH)/lib"
 
 clean:
 	rm -f bridge.o

bridge/Makefile

@@ -14,11 +14,6 @@ extern record bridge_tensor_t {
     var dim: int(32);
 }
 
-// extern record bridge_tensor_t_const {
-//     var data: c_ptrConst(real(32));
-//     var sizes: c_ptr(int(32));
-//     var dim: int(32);
-// }
 
 extern proc increment2(arr: [] real(32), sizes: [] int(32), dim: int(32)): bridge_tensor_t;
 extern proc increment3(in arr: bridge_tensor_t): bridge_tensor_t;
@@ -193,3 +188,5 @@ var result = bridgeTensorToArray(4, resultBT);
 // writeln("Bias: ", bias);
 // writeln("Result: ", result);
 writeln("Result: ", result.size);
+
+

bridge/bridge.o

@@ -32,7 +32,7 @@ void store_tensor(torch::Tensor &input, float32_t* dest) {
     std::memmove(dest,data,bytes_size);
 }
 
-bridge_tensor_t tensor_result_convert(torch::Tensor &tensor) {
+bridge_tensor_t torch_to_bridge(torch::Tensor &tensor) {
     bridge_tensor_t result;
     result.dim = tensor.dim();
     result.sizes = new int[result.dim];
@@ -47,16 +47,15 @@ bridge_tensor_t tensor_result_convert(torch::Tensor &tensor) {
 torch::Tensor bridge_to_torch(bridge_tensor_t &bt) {
     std::vector<int64_t> sizes_vec(bt.sizes, bt.sizes + bt.dim);
     auto shape = at::IntArrayRef(sizes_vec);
-    auto t = torch::from_blob(bt.data, shape, torch::kFloat);
-    return t;
+    return torch::from_blob(bt.data, shape, torch::kFloat);
 }
 
 extern "C" bridge_tensor_t increment3(bridge_tensor_t arr) {
     auto t = bridge_to_torch(arr);
     // Increment the tensor
     auto incremented_tensor = t + 1;
 
-    return tensor_result_convert(incremented_tensor);
+    return torch_to_bridge(incremented_tensor);
 }
 
 extern "C" bridge_tensor_t convolve2d(
@@ -70,7 +69,7 @@ extern "C" bridge_tensor_t convolve2d(
     auto t_kernel = bridge_to_torch(kernel);
     auto t_bias = bridge_to_torch(bias);
     auto output = torch::conv2d(t_input, t_kernel, t_bias, stride, padding);
-    return tensor_result_convert(output);
+    return torch_to_bridge(output);
 }
 
 
@@ -125,7 +124,7 @@ extern "C" bridge_tensor_t increment2(float* arr, int* sizes, int dim) {
 
     auto incremented_tensor = t + 1;
 
-    return tensor_result_convert(incremented_tensor);
+    return torch_to_bridge(incremented_tensor);
 }