VGG example working well. see bottom of cmake file.

Author: Iainmon

CMakeLists.txt

@@ -159,9 +159,6 @@ target_link_options(TorchBridge
         ${LIBTORCH_LIBS_LINKER_ARGS}
         --ldflags "-Wl,-rpath,${LIBTORCH_DIR}/lib"
 )
-# chpl test/tiny/layer_test.chpl -M lib bridge/include/bridge.h build/CMakeFiles/bridge.dir/bridge/lib/bridge.cpp.o -L libtorch/lib -ltorch -ltorch_cpu -lc10 -ltorch_global_deps --ldflags "-Wl,-rpath,libtorch/lib"
-
-# chpl --fast -o vgg test.chpl -M ../../lib /Users/iainmoncrief/Documents/Github/ChAI/bridge/include/bridge.h /Users/iainmoncrief/Documents/Github/ChAI/build/CMakeFiles/bridge.dir/bridge/lib/bridge.cpp.o -L /Users/iainmoncrief/Documents/Github/ChAI/libtorch/lib -ltorch -ltorch_cpu -lc10 -ltorch_global_deps --ldflags "-Wl,-rpath,/Users/iainmoncrief/Documents/Github/ChAI/libtorch/lib"
 
 
 
@@ -181,4 +178,11 @@ target_link_options(TinyLayerTest
         -L ${LIBTORCH_DIR}/lib
         ${LIBTORCH_LIBS_LINKER_ARGS}
         --ldflags "-Wl,-rpath,${LIBTORCH_DIR}/lib"
-)
+)
+# chpl test/tiny/layer_test.chpl -M lib bridge/include/bridge.h build/CMakeFiles/bridge.dir/bridge/lib/bridge.cpp.o -L libtorch/lib -ltorch -ltorch_cpu -lc10 -ltorch_global_deps --ldflags "-Wl,-rpath,libtorch/lib"
+
+# chpl --fast -o vgg test.chpl -M ../../lib /Users/iainmoncrief/Documents/Github/ChAI/bridge/include/bridge.h /Users/iainmoncrief/Documents/Github/ChAI/build/CMakeFiles/bridge.dir/bridge/lib/bridge.cpp.o -L /Users/iainmoncrief/Documents/Github/ChAI/libtorch/lib -ltorch -ltorch_cpu -lc10 -ltorch_global_deps --ldflags "-Wl,-rpath,/Users/iainmoncrief/Documents/Github/ChAI/libtorch/lib"
+
+# chpl -o vgg test.chpl $(../../embed_libtorch.sh .)
+# chpl --fast -o vgg test.chpl $(../../embed_libtorch.sh .)
+

bridge/lib/bridge.cpp

@@ -80,8 +80,6 @@ extern "C" bridge_tensor_t conv2d(
     int stride,
     int padding
 ) {
-
-    printf("Hello from conv2d!\n");
     auto t_input = bridge_to_torch(input);
     auto t_kernel = bridge_to_torch(kernel);
     auto t_bias = bridge_to_torch(bias);

embed_libtorch.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env sh
+
+#
+# This script prints the flags required by the Chapel compiler to embed Python
+# code in a Chapel program. It is intended to be used by consumers of the
+# 'Python' module. See https://chapel-lang.org/docs/modules/packages/Python.html
+#
+
+# get the chpl home directory
+# chpl_home=$(cd $(dirname $0) ; cd ..; cd ..; pwd)
+# chpl_python=$("$chpl_home/util/config/find-python.sh")
+
+cd "$(dirname "$0")"
+
+mkdir -p build
+cd build
+cmake .. > /dev/null
+make -j4 > /dev/null
+cd ..
+
+SOURCE_DIR=$(pwd)
+BRIDGE_LIB=$SOURCE_DIR/build/CMakeFiles/bridge.dir/bridge/lib/bridge.cpp.o
+LIBTORCH_DIR=$SOURCE_DIR/libtorch
+
+
+echo "-M $SOURCE_DIR/lib $SOURCE_DIR/bridge/include/bridge.h $BRIDGE_LIB -I $SOURCE_DIR/bridge/include -L $LIBTORCH_DIR/lib --ldflags -Wl,-rpath,$SOURCE_DIR/libtorch/lib"
+
+# PYTHON_INCLUDE_DIR=$($chpl_python -c "import sysconfig; print(sysconfig.get_paths()['include'])")
+# PYTHON_LIB_DIR=$($chpl_python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")
+# PYTHON_LDVERSION=$($chpl_python -c "import sysconfig; print(sysconfig.get_config_var('LDVERSION'))")
+
+# DISABLE_WARNINGS=""
+# # some older python's don't use `#ifndef` when they should
+# # so we disable redefinition warnings for clean testing
+# DISABLE_WARNINGS="$DISABLE_WARNINGS --ccflags -Wno-macro-redefined"
+
+# echo "--ccflags -isystem$PYTHON_INCLUDE_DIR -L$PYTHON_LIB_DIR --ldflags -Wl,-rpath,$PYTHON_LIB_DIR -lpython$PYTHON_LDVERSION $DISABLE_WARNINGS"

examples/vgg/test.chpl

@@ -26,7 +26,16 @@ proc confidence(x: []): [] {
 // returns (top k indicies, top k condiences)
 proc run(model: borrowed, file: string) {
   const img = Tensor.load(file):real(32);
-  const output = model(img);
+
+  writeln("Loaded image: ", file);
+  writeln("Image shape: ", img.shape());
+
+  var output = model(img);
+
+  for i in 0..10 do
+    output = model(img);
+    
+  writeln("Output shape: ", output.shape());
 
   const top = output.topk(k);
   var topArr = top.tensorize(1).array.data;
@@ -40,6 +49,7 @@ proc main(args: [] string) {
   const labels = getLabels();
   const vgg = new VGG16(real(32));
   vgg.loadPyTorchDump("models/vgg16/", false);
+  writeln("Loaded VGG16 model.");
 
 
   var files = args[1..];

lib/Bridge.chpl

@@ -1,4 +1,6 @@
 module Bridge {
+    // require "bridge.h";
+    require "-ltorch", "-ltorch_cpu", "-lc10", "-ltorch_global_deps";
 
     import Utilities as util;
     use Utilities.Standard;