Fix build system and failures for linux

.dockerignore

@@ -0,0 +1,11 @@
+presentation
+libtorch_static
+libtorch
+target
+docs
+dependencies
+build
+cmake-build-debug
+.git
+learning
+.cache

.gitignore

@@ -45,3 +45,7 @@ libtorch/
 build-release/
 libtorch_static/
 examples/vgg/**/*.pt
+segmentation_models.pytorch/
+.idea/
+cmake-build-debug/
+libtorch_old/

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 # project(MyProject LANGUAGES CXX)
 
 include(CMakePrintHelpers)
@@ -15,7 +15,7 @@ set(PROJECT_CACHE_DIR "${PROJECT_ROOT_DIR}/.cache")
 set(LIBTORCH_DIR "${PROJECT_ROOT_DIR}/libtorch")
 # set(LIBTORCH_STATIC_INSTALL_DIR "${PROJECT_ROOT_DIR}/libtorch_static")
 set(BRIDGE_DIR "${PROJECT_ROOT_DIR}/bridge")
-
+set(Torch_DIR "${PROJECT_ROOT_DIR}/libtorch")
 
 find_package(chpl REQUIRED HINTS ${PROJECT_ROOT_DIR}/cmake/chapel)
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_ROOT_DIR}/cmake")
@@ -38,62 +38,16 @@ download_libtorch(
     DESTINATION ${LIBTORCH_DIR}
 )
 
-include(FetchContent)
-include(ExternalProject)
-
-
-# if(NOT EXISTS "${LIBTORCH_STATIC_INSTALL_DIR}/lib/libtorch.a")
-#     ExternalProject_Add(
-#     pytorch
-#     GIT_REPOSITORY      https://github.com/pytorch/pytorch.git
-#     GIT_TAG             v2.6.0                # Example: specify a particular release
-#     UPDATE_COMMAND      ""                     # Don’t auto-run 'git pull'
-#     PATCH_COMMAND       ""                     # No custom patch step
-
-#     # DOWNLOAD_DIR         "${CMAKE_BINARY_DIR}/pytorch-download" # Where to download the repo
-
-#     # We need all PyTorch submodules. By default, ExternalProject won't do submodule init.
-#     # So we can do that in a separate step if we want a full build. For a minimal CPU build,
-#     # you might not need them all, but let's be safe:
-#     STEP_TARGETS        clone
-#     # After 'clone', run "git submodule update --init --recursive"
-#     # to fetch all submodules.
-#     # We can use a little trick with COMMAND.
-#     #   PATCH_COMMAND       "git submodule update --init --recursive"
-
-#     # CMAKE_ARGS
-#     #     -DBUILD_SHARED_LIBS=OFF              # Build static libraries
-#     #     -DBUILD_PYTHON=OFF                   # Don’t build Python bindings
-#     #     -DBUILD_TEST=OFF                     # Don’t build tests
-#     #     -DUSE_CUDA=OFF                       # Disable CUDA
-#     #     -DUSE_CUDNN=OFF                      # Disable cuDNN
-#     #     -DUSE_MKLDNN=OFF                     # Disable MKLDNN for simplicity
-#     #     # -DBUILD_BINARY=ON
-#     #     # -DUSE_DISTRIBUTED=ON
-#     #     # -DBUILD_STATIC_RUNTIME_BENCHMARK=ON
-#     #     # -DBUILD_LITE_INTERPRETER=ON
-#     #     # -DUSE_STATIC_MKL=ON
-#     #     # -DSTATIC_DISPATCH_BACKEND=ON
-#     #     # -DCAFFE2_USE_MSVC_STATIC_RUNTIME=ON
-#     #     # -DUSE_DISTRIBUTED=ON
-#     #     # -DCMAKE_BUILD_TYPE=Release
-#     #     -DCMAKE_INSTALL_PREFIX=${PYTORCH_INSTALL_DIR}
-#     #     # -DCMAKE_POLICY_VERSION_MINIMUM=3.5
-#         CMAKE_ARGS
-#             -DBUILD_SHARED_LIBS=OFF              # Build static libraries
-#             -DBUILD_PYTHON=OFF                   # Don’t build Python bindings
-#             -DBUILD_TEST=OFF                     # Don’t build tests
-#             -DUSE_CUDA=OFF                       # Disable CUDA
-#             -DUSE_CUDNN=OFF                      # Disable cuDNN
-#             -DUSE_MKLDNN=OFF                     # Disable MKLDNN for simplicity
-#             -DCMAKE_BUILD_TYPE=Release
-#             # -DSTATIC_DISPATCH_BACKEND=ON
-#             -DCMAKE_INSTALL_PREFIX=${LIBTORCH_STATIC_INSTALL_DIR}
-#             -DCMAKE_POLICY_VERSION_MINIMUM=3.5
-
-#     INSTALL_DIR         ${LIBTORCH_STATIC_INSTALL_DIR} # Where to install
-#     )
-# endif()
+list(APPEND CMAKE_PREFIX_PATH "${LIBTORCH_DIR}/share/cmake")
+find_package(Torch REQUIRED)  
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++23 -lm -ldl ${TORCH_CXX_FLAGS}")
+
+
+cmake_print_variables(TORCH_LIBRARIES)
+cmake_print_variables(TORCH_INCLUDE_DIRS)
+cmake_print_variables(TORCH_INSTALL_PREFIX)
+cmake_print_variables(TORCH_CXX_FLAGS)
+cmake_print_variables(TORCH_LIBRARY)
 
 
 file(GLOB CHAI_LIB_FILES "${PROJECT_ROOT_DIR}/lib/*.chpl")
@@ -151,18 +105,32 @@ function(watch)
     )
 endfunction()
 
+
+
 # cmake_print_variables(CHAI_LIB_FILES)
 
-add_library(bridge STATIC ${BRIDGE_DIR}/include/bridge.h ${BRIDGE_DIR}/lib/bridge.cpp)
+add_library(bridge OBJECT ${BRIDGE_DIR}/include/bridge.h ${BRIDGE_DIR}/lib/bridge.cpp)
+
+target_link_libraries(
+    bridge
+    PRIVATE
+    ${TORCH_LIBRARIES}
+    # ${LIBTORCH_DIR}/lib/libtorch.so
+    # ${LIBTORCH_DIR}/lib/libtorch_cpu.so
+    # ${LIBTORCH_DIR}/lib/libc10.so
+    # ${LIBTORCH_DIR}/lib/libtorch_global_deps.so
+)
 
 target_include_directories(
     bridge
     PRIVATE
     ${BRIDGE_DIR}/include
     ${LIBTORCH_DIR}/include
     ${LIBTORCH_DIR}/include/torch/csrc/api/include
+    # ${BRIDGE_DIR}/util
 )
 
+
 set(BRIDGE_OBJECT_FILES $<TARGET_OBJECTS:bridge>)
 
 
@@ -204,13 +172,19 @@ foreach(lib_name IN LISTS LIBTORCH_ALL_LIBS)
     list(APPEND LIBTORCH_LIBS_LINKER_ARGS "-l${lib_name_short}")
 endforeach()
 
-if(LINUX)
-    set(LIBTORCH_LINKER_ARGS
-        "-ltorch"
-        "-ltorch_cpu"
-        "-lc10"
-    )
-endif()
+cmake_print_variables(LIBTORCH_LIBS_LINKER_ARGS)
+# cmake_print_variables(${BRIDGE_OBJECT_FILES})
+# cmake_print_variables(BRIDGE_OBJECT_FILES)
+
+
+set(LIBTORCH_LIBS_LINKER_ARGS 
+    "-ltorch"
+    # "-ltorch_cpu"
+    # "-lc10"
+    # "-ltorch_global_deps"
+)
+cmake_print_variables(LIBTORCH_LIBS_LINKER_ARGS)
+
 
 add_executable(TorchBridge ${BRIDGE_DIR}/lib/Bridge.chpl)
 add_dependencies(TorchBridge bridge)
@@ -220,10 +194,10 @@ target_link_options(TorchBridge
         ${BRIDGE_DIR}/include/bridge.h
         ${BRIDGE_OBJECT_FILES}
         -L ${LIBTORCH_DIR}/lib
-        # "-ltorch"
-        # "-ltorch_cpu"
-        # "-lc10"
-        # "-ltorch_global_deps"
+        "-ltorch"
+        "-ltorch_cpu"
+        "-lc10"
+        "-ltorch_global_deps"
         ${LIBTORCH_LIBS_LINKER_ARGS}
         --ldflags "-Wl,-rpath,${LIBTORCH_DIR}/lib"
 )
@@ -293,5 +267,33 @@ add_custom_command(
 
 # ./vgg images/frog.jpg
 
+# add_subdirectory(bridge)
+
 add_subdirectory(examples)
 add_subdirectory("test")
+add_subdirectory(demos)
+
+
+
+add_executable(MPSTest
+    "${PROJECT_ROOT_DIR}/test/tiny/mps.cpp"
+)
+
+target_include_directories(MPSTest
+    PRIVATE
+        ${LIBTORCH_DIR}/include
+        ${LIBTORCH_DIR}/include/torch/csrc/api/include
+)
+
+target_link_directories(MPSTest
+    PRIVATE
+        ${LIBTORCH_DIR}/lib
+)
+
+target_link_libraries(MPSTest
+    PRIVATE 
+        -ltorch
+        -ltorch_cpu
+        -lc10
+        -ltorch_global_deps
+)

Dockerfile

@@ -1,37 +1,79 @@
-FROM ubuntu:22.04
+# ────────────────────────────────
+# 1. Build stage
+# ────────────────────────────────
+FROM ubuntu:24.04 AS builder
 
 
-# RUN apt update > /dev/null && apt install -y apt-utils && apt upgrade -y > /dev/null
 
+ENV DEBIAN_FRONTEND=noninteractive
 
 COPY deb /
 
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt update > /dev/null && \
-    apt upgrade -y > /dev/null && \
-    apt install -y apt-utils > /dev/null && \
-    apt install -y python3-pip > /dev/null && \
-    (apt install -y ./chapel-2.3.0-1.ubuntu22.arm64.deb > /dev/null) || (apt install -y ./chapel-2.3.0-1.ubuntu22.amd64.deb > /dev/null)
+# -------- toolchain & helpers
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        build-essential g++ cmake ninja-build \
+        git curl wget ca-certificates unzip \
+        python3 python3-pip libssl-dev \
+        apt-utils \
+    && ((apt-get install -y --no-install-recommends ./chapel-2.4.0-1.ubuntu24.arm64.deb) || (apt-get install -y --no-install-recommends ./chapel-2.4.0-1.ubuntu24.amd64.deb)) \
+    && rm -rf /var/lib/apt/lists/*
 
+#     && (apt-get install -y --no-install-recommends ./chapel-2.4.0-1.ubuntu24.arm64.deb) || (apt install -y ./chapel-2.4.0-1.ubuntu24.amd64.deb)
 
+# -------- LibTorch (change CUDA tag for GPU builds)
+# ARG TORCH_VERSION=2.2.0         # ← keep in sync with your sources
+# ARG TORCH_VARIANT=cpu           # cpu | cu118 | cu121 …
+# RUN mkdir -p /opt \
+#  && cd /opt \
+#  && wget -q --show-progress \
+#       https://download.pytorch.org/libtorch/${TORCH_VARIANT}/libtorch-cxx11-abi-shared-with-deps-${TORCH_VERSION}%2B${TORCH_VARIANT}.zip \
+#  && unzip libtorch-cxx11-abi-shared-with-deps-${TORCH_VERSION}+${TORCH_VARIANT}.zip \
+#  && rm libtorch-cxx11-abi-shared-with-deps-${TORCH_VERSION}+${TORCH_VARIANT}.zip
 
-RUN pip3 install numpy > /dev/null
 
-RUN pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cpu > /dev/null
+RUN mkdir -p /app \
+    && cd /app \
+    && wget -q --show-progress \
+        https://download.pytorch.org/libtorch/nightly/cpu/libtorch-cxx11-abi-shared-with-deps-latest.zip \
+    && unzip libtorch-cxx11-abi-shared-with-deps-latest.zip \
+    && mkdir -p /app/.cache \
+    && mv /app/libtorch-cxx11-abi-shared-with-deps-latest.zip /app/.cache/libtorch_cache.zip
 
 
-COPY lib /lib
-COPY examples /examples
-COPY test /test
+ENV Torch_DIR=/app/libtorch
+ENV CMAKE_PREFIX_PATH=/app/libtorch/libtorch/share/cmake
+# lets CMake find TorchConfig.cmake
 
-# Run tests
-RUN cd test/correspondence && python3 correspondence.py
-RUN cd test/correspondence && python3 correspondence.py --print-compiler-errors
 
+# -------- build your project
+WORKDIR /app
+COPY . /app
+
+# (uncomment if you have submodules)
+# RUN git submodule update --init --recursive
+
+RUN ls
+
+RUN cd /app \
+    && mkdir -p build \
+    && cd build \
+    && cmake -DCMAKE_BUILD_TYPE=Debug .. \
+    && make MyExample
+
+# RUN mkdir build \
+#     && cd build \
+#     && cmake -DCMAKE_BUILD_TYPE=Debug .. \
+#     && make TinyLayerTest -j$(nproc)
+
+#RUN cd build && ./TinyLayerTest
+
+    # && cmake -DCMAKE_PREFIX_PATH=/opt/libtorch -DCMAKE_BUILD_TYPE=Release .. \
+
+# configure-and-build
+# RUN cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release \
+#  && cmake --build build --target all -j$(nproc)
+
+# RUN cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release
+
+# RUN cmake --build build --target all -j$(nproc)
 
-# Build instructions
-# force (last resort): docker system prune --all --force
-# docker builder prune --all
-# docker build --no-cache -t chapel-deb .
-# docker build -t chapel-deb .
-# docker container run -it chapel-deb bash

Dockerfile.testing

@@ -0,0 +1,37 @@
+FROM ubuntu:24.04
+
+
+# RUN apt update > /dev/null && apt install -y apt-utils && apt upgrade -y > /dev/null
+
+
+COPY deb /
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+    apt update > /dev/null && \
+    apt upgrade -y > /dev/null && \
+    apt install -y apt-utils > /dev/null && \
+    apt install -y python3-pip > /dev/null && \
+    (apt install -y ./chapel-2.4.0-1.ubuntu25.arm64.deb > /dev/null) || (apt install -y ./chapel-2.4.0-1.ubuntu25.amd64.deb > /dev/null)
+
+
+
+RUN pip3 install numpy > /dev/null
+
+RUN pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cpu > /dev/null
+
+
+COPY lib /lib
+COPY examples /examples
+COPY test /test
+
+# Run tests
+RUN cd test/correspondence && python3 correspondence.py
+RUN cd test/correspondence && python3 correspondence.py --print-compiler-errors
+
+
+# Build instructions
+# force (last resort): docker system prune --all --force
+# docker builder prune --all
+# docker build --no-cache -t chapel-deb .
+# docker build -t chapel-deb .
+# docker container run -it chapel-deb bash