Merge branch 'fix/cdci-cmake' into update/node-name-log

Xinyu Li · Xinyu Li · commit 458c3ce5a8cc · 2025-04-10T13:06:49.000-07:00
merge
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -44,11 +44,12 @@ jobs:
           sudo cp -r ${HOME}/onnxruntime/* /usr/
 
           # zlib, libjpeg, libpng
-          vcpkg install
+          git clone https://github.com/microsoft/vcpkg.git && bash vcpkg/bootstrap-vcpkg.sh
+          vcpkg/vcpkg install 
 
       - name: Configure
         shell: bash
-        run: cmake -D CMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -D ION_BUILD_TEST=ON -D ION_BUILD_EXAMPLE=ON $GITHUB_WORKSPACE
+        run: cmake -D CMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -D ION_BUILD_TEST=ON -D ION_BUILD_EXAMPLE=ON $GITHUB_WORKSPACE
 
       - name: Build
         shell: bash
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -29,10 +29,14 @@ jobs:
             mkdir ${HOME}/Halide
             curl -L https://github.com/halide/Halide/releases/download/v17.0.1/Halide-17.0.1-arm-64-osx-52541176253e74467dabc42eeee63d9a62c199f6.tar.gz | tar zx -C ${HOME}/Halide --strip-components 1
             find ${HOME}/Halide -type d | xargs chmod 755
+            
+            # zlib, libjpeg, libpng
+            git clone https://github.com/microsoft/vcpkg.git && bash vcpkg/bootstrap-vcpkg.sh
+            ${{ github.workspace }}/vcpkg/vcpkg install 
 
       - name: Configure
         shell: bash
-        run: cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D ION_BUILD_TEST=ON -D ION_BUILD_EXAMPLE=ON -D HalideHelpers_DIR=${HOME}/Halide/lib/cmake/HalideHelpers -D Halide_DIR=${HOME}/Halide/lib/cmake/Halide $GITHUB_WORKSPACE
+        run: cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D CMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -D ION_BUILD_TEST=ON -D ION_BUILD_EXAMPLE=ON -D HalideHelpers_DIR=${HOME}/Halide/lib/cmake/HalideHelpers -D Halide_DIR=${HOME}/Halide/lib/cmake/Halide $GITHUB_WORKSPACE
 
       - name: Build
         shell: bash
diff --git a/.github/workflows/python_publish.yml b/.github/workflows/python_publish.yml
@@ -132,7 +132,7 @@ jobs:
           cp  $GITHUB_WORKSPACE/macos/lib/libion-bb.dylib python/ionpy/module/macos/libion-bb.dylib
           
           mkdir $GITHUB_WORKSPACE/aravis
-          curl -L https://github.com/Sensing-Dev/aravis/releases/download/v0.8.31/aravis-0.8.31-arm-64-macos.tar.gz| tar zx -C $GITHUB_WORKSPACE/aravis --strip-components 1
+          curl -L https://github.com/Sensing-Dev/aravis/releases/download/v0.8.31.post1/aravis-0.8.31.post1-arm-64-macos.tar.gz| tar zx -C $GITHUB_WORKSPACE/aravis --strip-components 1
           cp  $GITHUB_WORKSPACE/aravis/lib/libaravis-0.8.0.dylib python/ionpy/module/macos/libaravis-0.8.dylib
           ls python/ionpy/module/macos
 
@@ -147,7 +147,7 @@ jobs:
           cp  $GITHUB_WORKSPACE/linux/lib/libHalide.so.17.0.1 python/ionpy/module/linux/libHalide.so.17
           
           mkdir $GITHUB_WORKSPACE/aravis     
-          curl -L https://github.com/Sensing-Dev/aravis/releases/download/v0.8.31/aravis-0.8.31-x86-64-linux.tar.gz | tar zx -C $GITHUB_WORKSPACE/aravis --strip-components 1
+          curl -L https://github.com/Sensing-Dev/aravis/releases/download/v0.8.31.post1/aravis-0.8.31.post1-x86-64-linux.tar.gz | tar zx -C $GITHUB_WORKSPACE/aravis --strip-components 1
           cp  $GITHUB_WORKSPACE/aravis/lib/x86_64-linux-gnu/libaravis-0.8.so.0.8.31 python/ionpy/module/linux/libaravis-0.8.so     
           ls python/ionpy/module/linux
 
@@ -161,11 +161,11 @@ jobs:
           cp  windows/bin/ion-core.dll python/ionpy/module/windows/ion-core.dll
           cp  windows/bin/ion-bb.dll python/ionpy/module/windows/ion-bb.dll
 
-          curl -L https://github.com/Sensing-Dev/aravis/releases/download/v0.8.31/aravis-0.8.31-x86-64-windows.zip -o aravis-bin.zip
+          curl -L https://github.com/Sensing-Dev/aravis/releases/download/v0.8.31.post1/aravis-0.8.31.post1-x86-64-windows.zip -o aravis-bin.zip
           tar -xf aravis-bin.zip 
           cp aravis/bin/aravis-0.8-0.dll python/ionpy/module/windows/aravis-0.8-0.dll
           
-          curl -L https://github.com/Sensing-Dev/aravis/releases/download/v0.8.31/aravis-0.8.31-dependencies.zip -o dependency-bin.zip
+          curl -L https://github.com/Sensing-Dev/aravis/releases/download/v0.8.31.post1/aravis-0.8.31.post1-dependencies.zip -o dependency-bin.zip
           tar -xf dependency-bin.zip 
           mv aravis_dependencies/bin/*.dll python/ionpy/module/windows/
           
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,10 +31,11 @@ jobs:
           find ${HOME}/Halide -type d | xargs chmod 755
 
           # zlib, libjpeg, libpng
-          vcpkg install
+          git clone https://github.com/microsoft/vcpkg.git && bash vcpkg/bootstrap-vcpkg.sh
+          vcpkg/vcpkg install
 
       - name: Configure
-        run: cmake -D CMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake -D CMAKE_BUILD_TYPE=Release -D ION_BUILD_TEST=OFF -D ION_BUILD_EXAMPLE=OFF -D ION_BUNDLE_HALIDE=ON -D HalideHelpers_DIR=${HOME}/Halide/lib/cmake/HalideHelpers -D Halide_DIR=${HOME}/Halide/lib/cmake/Halide $GITHUB_WORKSPACE
+        run: cmake -D CMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -D CMAKE_BUILD_TYPE=Release -D ION_BUILD_TEST=OFF -D ION_BUILD_EXAMPLE=OFF -D ION_BUNDLE_HALIDE=ON -D HalideHelpers_DIR=${HOME}/Halide/lib/cmake/HalideHelpers -D Halide_DIR=${HOME}/Halide/lib/cmake/Halide $GITHUB_WORKSPACE
 
       - name: Build
         run: cmake --build . --config Release --target package
@@ -70,11 +71,12 @@ jobs:
           mv Halide*/* ${HOME}/Halide
 
           # zlib, libjpeg, libpng
-          vcpkg install --triplet=x64-windows-static
+          git clone https://github.com/microsoft/vcpkg.git && ./vcpkg/bootstrap-vcpkg.bat
+          vcpkg/vcpkg.exe install --triplet=x64-windows-static
 
       - name: Configure
         shell: bash
-        run: cmake -G "Visual Studio 16 2019" -A x64 -D VCPKG_TARGET_TRIPLET=x64-windows-static -D CMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake -D ION_BUILD_DOC=OFF -D ION_BUILD_TEST=OFF -D ION_BUILD_EXAMPLE=OFF -D ION_BUNDLE_HALIDE=ON -D HalideHelpers_DIR=${HOME}/Halide/lib/cmake/HalideHelpers -D Halide_DIR=${HOME}/Halide/lib/cmake/Halide $GITHUB_WORKSPACE
+        run: cmake -G "Visual Studio 16 2019" -A x64 -D VCPKG_TARGET_TRIPLET=x64-windows-static -D CMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake -D ION_BUILD_DOC=OFF -D ION_BUILD_TEST=OFF -D ION_BUILD_EXAMPLE=OFF -D ION_BUNDLE_HALIDE=ON -D HalideHelpers_DIR=${HOME}/Halide/lib/cmake/HalideHelpers -D Halide_DIR=${HOME}/Halide/lib/cmake/Halide $GITHUB_WORKSPACE
 
       - name: Build
         shell: bash
@@ -103,10 +105,14 @@ jobs:
             mkdir ${HOME}/Halide
             curl -L https://github.com/halide/Halide/releases/download/v17.0.1/Halide-17.0.1-arm-64-osx-52541176253e74467dabc42eeee63d9a62c199f6.tar.gz | tar zx -C ${HOME}/Halide --strip-components 1
             find ${HOME}/Halide -type d | xargs chmod 755
+          
+            # zlib, libjpeg, libpng
+            git clone https://github.com/microsoft/vcpkg.git && bash vcpkg/bootstrap-vcpkg.sh
+            vcpkg/vcpkg install
 
       - name: Configure
         shell: bash
-        run: cmake -D CMAKE_BUILD_TYPE=Release -D ION_BUILD_TEST=OFF -D ION_BUILD_EXAMPLE=OFF -D ION_BUNDLE_HALIDE=ON -D HalideHelpers_DIR=${HOME}/Halide/lib/cmake/HalideHelpers -D Halide_DIR=${HOME}/Halide/lib/cmake/Halide $GITHUB_WORKSPACE
+        run: cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -D ION_BUILD_TEST=OFF -D ION_BUILD_EXAMPLE=OFF -D ION_BUNDLE_HALIDE=ON -D HalideHelpers_DIR=${HOME}/Halide/lib/cmake/HalideHelpers -D Halide_DIR=${HOME}/Halide/lib/cmake/Halide $GITHUB_WORKSPACE
 
       - name: Build
         shell: bash
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -36,12 +36,13 @@ jobs:
           rm Halide.zip
           mv Halide*/* ${HOME}/Halide
 
-          # zlib, libjpeg, libpng
-          vcpkg install --triplet=x64-windows-static
+          # zlib, libjpeg, libpng, use the latest to vcpkg
+          git clone https://github.com/microsoft/vcpkg.git && ./vcpkg/bootstrap-vcpkg.bat
+          vcpkg/vcpkg.exe install --triplet=x64-windows-static
 
       - name: Configure
         shell: bash
-        run: cmake -G "Visual Studio 16 2019" -A x64 -D VCPKG_TARGET_TRIPLET=x64-windows-static -D CMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake -D ION_BUILD_TEST=ON -D ION_BUILD_EXAMPLE=ON -D HalideHelpers_DIR=${HOME}/Halide/lib/cmake/HalideHelpers -D Halide_DIR=${HOME}/Halide/lib/cmake/Halide $GITHUB_WORKSPACE
+        run: cmake -G "Visual Studio 16 2019" -A x64 -D VCPKG_TARGET_TRIPLET=x64-windows-static -D CMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake -D ION_BUILD_TEST=ON -D ION_BUILD_EXAMPLE=ON -D HalideHelpers_DIR=${HOME}/Halide/lib/cmake/HalideHelpers -D Halide_DIR=${HOME}/Halide/lib/cmake/Halide $GITHUB_WORKSPACE
 
       - name: Build
         shell: bash
diff --git a/BUILD-Linux.md b/BUILD-Linux.md
@@ -3,7 +3,7 @@
 Here is the list of dependent software.
 
 - Mandatory
-  - [Halide (v16.0.0)](https://github.com/halide/Halide/releases/tag/v16.0.0)
+  - [Halide (v17.0.1)](https://github.com/halide/Halide/releases/tag/v17.0.1)
 - Optional
   - [libjpeg](https://libjpeg-turbo.org/)
   - [libpng](http://www.libpng.org/)
@@ -12,7 +12,7 @@ Here is the list of dependent software.
 For Halide, please find latest binary release [here](https://github.com/halide/Halide/releases).
 
 ```sh
-curl -sL https://github.com/halide/Halide/releases/download/v16.0.0/Halide-16.0.0-x86-64-linux-1e963ff817ef0968cc25d811a25a7350c8953ee6.tar.gz | tar zx
+curl -sL https://github.com/halide/Halide/releases/download/v17.0.1/Halide-17.0.1-x86-64-linux-52541176253e74467dabc42eeee63d9a62c199f6.tar.gz | tar zx
 ```
 
 We recommend to setup libjpeg-turbo, libpng and zlib by [vcpkg](https://vcpkg.io/).
diff --git a/BUILD-MacOS.md b/BUILD-MacOS.md
@@ -3,12 +3,12 @@
 Here is the list of dependent software.
 
 - Mandatory
-  - [Halide (v16.0.0)](https://github.com/halide/Halide/releases/tag/v16.0.0)
+  - [Halide (v17.0.1)](https://github.com/halide/Halide/releases/tag/v17.0.1)
 
 For Halide, please find latest binary release [here](https://github.com/halide/Halide/releases).
 
 ```sh
-curl -sL https://github.com/halide/Halide/releases/download/v16.0.0/Halide-16.0.0-arm-64-osx-1e963ff817ef0968cc25d811a25a7350c8953ee6.tar.gz | tar zx
+curl -sL https://github.com/halide/Halide/releases/download/v17.0.1/Halide-17.0.1-arm-64-osx-52541176253e74467dabc42eeee63d9a62c199f6.tar.gz | tar zx
 ```
 
 ## 2. Build
diff --git a/BUILD-Windows.md b/BUILD-Windows.md
@@ -3,7 +3,7 @@
 Here is the list of dependent software.
 
 - Mandatory
-  - [Halide (v16.0.0)](https://github.com/halide/Halide/releases/tag/v16.0.0)
+  - [Halide (v17.0.1)](https://github.com/halide/Halide/releases/tag/v17.0.1)
 - Optional
   - [libjpeg](https://libjpeg-turbo.org/)
   - [libpng](http://www.libpng.org/)
diff --git a/python/ionpy/native.py b/python/ionpy/native.py
@@ -7,6 +7,7 @@
 if platform.system() == 'Windows':
     ion_core_module = os.path.join(pre_built_path, 'windows/ion-core.dll')
     ion_bb_module = os.path.join(pre_built_path, 'windows/ion-bb.dll')
+    os.environ["PATH"] = '{};'.format(os.path.join(pre_built_path, 'windows')) + os.environ["PATH"]
     os.add_dll_directory(os.path.join(pre_built_path, 'windows'))
 elif platform.system() == 'Darwin':
     ion_core_module = os.path.join(pre_built_path, 'macos/libion-core.dylib')
diff --git a/python/setup.py b/python/setup.py
@@ -24,7 +24,7 @@ def run(self):
 
 
 def get_plat():
-    if platform.system() == 'Linux':
+    if platform.system() == 'Linux' and platform.machine() == 'x86_64':
         plat_form = "manylinux1_x86_64"
     else:
         plat_form = sysconfig.get_platform()
diff --git a/src/bb/image-io/bb.h b/src/bb/image-io/bb.h
@@ -1085,7 +1085,7 @@ class BinarySaver : public ion::BuildingBlock<BinarySaver<T, D>> {
     BuildingBlockParam<std::string> output_directory_ptr{"output_directory", "."};
     BuildingBlockParam<std::string> prefix_ptr{"prefix", "raw-"};
 
-    Input<Halide::Func> input_images{"input", Halide::type_of<T>(), D};
+    Input<Halide::Func> input_image{"input", Halide::type_of<T>(), D};
     Input<Halide::Func> input_deviceinfo{"input_deviceinfo", Halide::type_of<uint8_t>(), 1};
     Input<Halide::Func> frame_count{"frame_count", Halide::type_of<uint32_t>(), 1};
     Input<int32_t> width{"width"};
@@ -1116,7 +1116,7 @@ class BinarySaver : public ion::BuildingBlock<BinarySaver<T, D>> {
         Buffer<uint8_t> id_buf = this->get_id();
 
         Func image;
-        image(_) = input_images(_);
+        image(_) = input_image(_);
         image.compute_root();
 
         Func deviceinfo;
@@ -1182,46 +1182,68 @@ class BinaryGenDCSaver : public ion::BuildingBlock<BinaryGenDCSaver> {
     }
 };
 
-class BinaryLoader : public ion::BuildingBlock<BinaryLoader> {
+template<typename T>
+class BinaryLoader : public ion::BuildingBlock<BinaryLoader<T>> {
 public:
-    BuildingBlockParam<std::string> output_directory_ptr{"output_directory_ptr", ""};
-    Input<int32_t> width{"width", 0};
-    Input<int32_t> height{"height", 0};
-    Output<Halide::Func> output0{"output0", UInt(16), 2};
-    Output<Halide::Func> output1{"output1", UInt(16), 2};
-    Output<Halide::Func> finished{"finished", UInt(1), 1};
-    Output<Halide::Func> bin_idx{"bin_idx", UInt(32), 1};
+    BuildingBlockParam<std::string> output_directory_ptr{"output_directory", ""};
+    BuildingBlockParam<std::string> prefix_ptr{"prefix", "raw-"};
+    Input<int32_t>width{"width"};
+    Input<int32_t> height{"height"};
+    Output<Halide::Func> output{"output", type_of<T>(), 2};
+    Output<Halide::Func> finished{"finished", Halide::UInt(1), 1};
+    Output<Halide::Func> bin_idx{"bin_idx", Halide::UInt(32), 1};
+    Output<Halide::Func> frame_count{"frame_count", Halide::UInt(32), 1};
 
     void generate() {
         using namespace Halide;
+        Func binaryloader;
 
-        std::string session_id = sole::uuid4().str();
-        Buffer<uint8_t> session_id_buf(static_cast<int>(session_id.size() + 1));
-        session_id_buf.fill(0);
-        std::memcpy(session_id_buf.data(), session_id.c_str(), session_id.size());
+        {
+            Buffer<uint8_t> id_buf = this->get_id();
+            const std::string output_directory(output_directory_ptr);
+            Halide::Buffer<uint8_t> output_directory_buf(static_cast<int>(output_directory.size() + 1));
+            output_directory_buf.fill(0);
+            std::memcpy(output_directory_buf.data(), output_directory.c_str(), output_directory.size());
 
-        const std::string output_directory(output_directory_ptr);
-        Halide::Buffer<uint8_t> output_directory_buf(static_cast<int>(output_directory.size() + 1));
-        output_directory_buf.fill(0);
-        std::memcpy(output_directory_buf.data(), output_directory.c_str(), output_directory.size());
+            const std::string prefix(prefix_ptr);
+            Halide::Buffer<uint8_t> prefix_buf(static_cast<int>(prefix.size() + 1));
+            prefix_buf.fill(0);
+            std::memcpy(prefix_buf.data(), prefix.c_str(), prefix.size());
 
-        std::vector<ExternFuncArgument> params = {session_id_buf, width, height, output_directory_buf};
-        Func binaryloader;
-        binaryloader.define_extern("binaryloader", params, {UInt(16), UInt(16)}, 2);
-        binaryloader.compute_root();
-        output0(_) = binaryloader(_)[0];
-        output1(_) = binaryloader(_)[1];
+            std::vector<ExternFuncArgument> params = {id_buf, width, height, output_directory_buf ,prefix_buf};
+
+            binaryloader.define_extern("binaryloader", params, type_of<T>(), 2);
+            binaryloader.compute_root();
+            output(_) = binaryloader(_);
+        }
 
         Func binaryloader_finished;
-        binaryloader_finished.define_extern("binaryloader_finished",
-                                            {binaryloader, session_id_buf, width, height, output_directory_buf},
-                                            {type_of<bool>(), UInt(32)}, 1);
-        binaryloader_finished.compute_root();
-        finished(_) = binaryloader_finished(_)[0];
-        bin_idx(_) = binaryloader_finished(_)[1];
+        {
+            Buffer<uint8_t> id_buf = this->get_id();
+            const std::string prefix(prefix_ptr);
+            Halide::Buffer<uint8_t> prefix_buf(static_cast<int>(prefix.size() + 1));
+            prefix_buf.fill(0);
+            std::memcpy(prefix_buf.data(), prefix.c_str(), prefix.size());
+
+            const std::string output_directory(output_directory_ptr);
+            Halide::Buffer<uint8_t> output_directory_buf(static_cast<int>(output_directory.size() + 1));
+            output_directory_buf.fill(0);
+            std::memcpy(output_directory_buf.data(), output_directory.c_str(), output_directory.size());
+            binaryloader_finished.define_extern("binaryloader_finished",
+                                                  {binaryloader, id_buf, width, height, output_directory_buf, prefix_buf},
+                                                  {UInt(1), UInt(32),UInt(32)}, 1);
+            binaryloader_finished.compute_root();
+            finished(_) = binaryloader_finished(_)[0];
+            bin_idx(_) = binaryloader_finished(_)[1];
+            frame_count(_) = binaryloader_finished(_)[2];
+        }
+        this->register_disposer("reader_dispose");
     }
 };
 
+using BinaryLoader_U8x2 = BinaryLoader<uint8_t>;
+using BinaryLoader_U16x2 = BinaryLoader<uint16_t>;
+
 }  // namespace image_io
 }  // namespace bb
 }  // namespace ion
@@ -1263,7 +1285,9 @@ ION_REGISTER_BUILDING_BLOCK(ion::bb::image_io::BinarySaver_U8x3, image_io_binary
 ION_REGISTER_BUILDING_BLOCK(ion::bb::image_io::BinarySaver_U8x2, image_io_binarysaver_u8x2);
 ION_REGISTER_BUILDING_BLOCK(ion::bb::image_io::BinarySaver_U16x2, image_io_binarysaver_u16x2);
 
-ION_REGISTER_BUILDING_BLOCK(ion::bb::image_io::BinaryLoader, image_io_binaryloader);
+ION_REGISTER_BUILDING_BLOCK(ion::bb::image_io::BinaryLoader_U16x2, image_io_binaryloader);
+ION_REGISTER_BUILDING_BLOCK(ion::bb::image_io::BinaryLoader_U8x2, image_io_binaryloader_u8x2);
+ION_REGISTER_BUILDING_BLOCK(ion::bb::image_io::BinaryLoader_U16x2, image_io_binaryloader_u16x2);
 
 ION_REGISTER_BUILDING_BLOCK(ion::bb::image_io::BinaryGenDCSaver, image_io_binary_gendc_saver);
 
diff --git a/src/bb/image-io/rt_file.h b/src/bb/image-io/rt_file.h
diff --git a/src/bb/image-io/rt_u3v.h b/src/bb/image-io/rt_u3v.h
diff --git a/src/bb/image-processing/bb.h b/src/bb/image-processing/bb.h
diff --git a/src/builder.cc b/src/builder.cc
