From 2e584bcc913bea86aa44e6d2632044ed89dfd015 Mon Sep 17 00:00:00 2001 From: edgar Date: Fri, 6 Jan 2023 18:08:58 +0400 Subject: [PATCH 01/25] define base image --- .github/workflows/release.yml | 2 +- .github/workflows/release_docker.yml | 11 +++++++++-- docker/release.Dockerfile | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d632bb29..6a0b5936 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - uses: messense/maturin-action@v1 with: - container: ghcr.io/kornia/kornia-rs/release:latest + container: ghcr.io/kornia/kornia-rs/release-amd64:latest target: ${{ matrix.target }} manylinux: auto args: --release --out dist -i python${{ matrix.python-version }} diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml index 929030e2..cfc34d4c 100644 --- a/.github/workflows/release_docker.yml +++ b/.github/workflows/release_docker.yml @@ -10,6 +10,11 @@ env: jobs: build_docker: runs-on: ubuntu-latest + strategy: + matrix: + include: + - arch: amd64 + base_image: quay.io/pypa/manylinux2014_x86_64 steps: - name: Checkout the repository @@ -33,6 +38,8 @@ jobs: with: context: . file: ./docker/release.Dockerfile - platforms: linux/amd64 + platforms: linux/${{ matrix.arch }} push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/release:latest + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/release-${{ matrix.arch }}:latest + build-args: | + base_image=${{ matrix.base_image }} diff --git a/docker/release.Dockerfile b/docker/release.Dockerfile index dcd22ec2..6979925b 100644 --- a/docker/release.Dockerfile +++ b/docker/release.Dockerfile @@ -1,4 +1,5 @@ -FROM quay.io/pypa/manylinux2014_x86_64 +ARG base_image=quay.io/pypa/manylinux2014_x86_64 +FROM $base_image # rust image comes with sh, we like bash more SHELL ["/bin/bash", "-c"] From e6b5e07fa0fd5fb0a46e74e4bd60cca3e9e802dc Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 00:57:36 +0400 Subject: [PATCH 02/25] add aarch64 --- .github/workflows/release.yml | 11 +++++++++-- .github/workflows/release_docker.yml | 8 ++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a0b5936..f56e5c84 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,9 +13,16 @@ jobs: strategy: matrix: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - target: [x86_64] + target: [x86_64, aarch64] steps: - uses: actions/checkout@v3 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - - name: Log in to the Container registry uses: docker/login-action@v1 with: @@ -24,7 +31,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - uses: messense/maturin-action@v1 with: - container: ghcr.io/kornia/kornia-rs/release-amd64:latest + container: ghcr.io/kornia/kornia-rs/release-{{ matrix.target }}:latest target: ${{ matrix.target }} manylinux: auto args: --release --out dist -i python${{ matrix.python-version }} diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml index cfc34d4c..ede0c69b 100644 --- a/.github/workflows/release_docker.yml +++ b/.github/workflows/release_docker.yml @@ -15,10 +15,14 @@ jobs: include: - arch: amd64 base_image: quay.io/pypa/manylinux2014_x86_64 + label: x86_64 + - arch: arm64 + base_image: ghcr.io/rust-cross/manylinux2014-cross:aarch64 + label: aarch64 steps: - name: Checkout the repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -40,6 +44,6 @@ jobs: file: ./docker/release.Dockerfile platforms: linux/${{ matrix.arch }} push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/release-${{ matrix.arch }}:latest + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/release-${{ matrix.label }}:latest build-args: | base_image=${{ matrix.base_image }} From 2adf16eee269265c189c5230242e0cbbf4903835 Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 01:25:39 +0400 Subject: [PATCH 03/25] try another image --- .github/workflows/release_docker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml index ede0c69b..3f5c73c3 100644 --- a/.github/workflows/release_docker.yml +++ b/.github/workflows/release_docker.yml @@ -17,7 +17,8 @@ jobs: base_image: quay.io/pypa/manylinux2014_x86_64 label: x86_64 - arch: arm64 - base_image: ghcr.io/rust-cross/manylinux2014-cross:aarch64 + #base_image: ghcr.io/rust-cross/manylinux2014-cross:aarch64 + base_image: messense/manylinux_2_24-cross:aarch64 label: aarch64 steps: - From 1473b8328bcb4d30089c49970e37e62a6171c9d2 Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 01:40:40 +0400 Subject: [PATCH 04/25] try release directly with image --- .github/workflows/release.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f56e5c84..c9181bfd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,6 +41,39 @@ jobs: name: wheels path: dist + linux-aarch64: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + target: [aarch64] + steps: + - uses: actions/checkout@v3 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + - name: Log in to the Container registry + uses: docker/login-action@v1 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - uses: messense/maturin-action@v1 + with: + container: ghcr.io/rust-cross/manylinux2014-cross:aarch64 + target: ${{ matrix.target }} + manylinux: auto + args: --release --out dist -i python${{ matrix.python-version }} + - name: Upload wheels + uses: actions/upload-artifact@v2 + with: + name: wheels + path: dist + macos: runs-on: macos-latest strategy: From c1d7603ea3c69bd82d5a92cafe13009625348e0f Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 01:46:18 +0400 Subject: [PATCH 05/25] try release directly with image --- .github/workflows/release.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c9181bfd..637e787e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,13 +16,10 @@ jobs: target: [x86_64, aarch64] steps: - uses: actions/checkout@v3 - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - - name: Log in to the Container registry uses: docker/login-action@v1 with: @@ -49,13 +46,10 @@ jobs: target: [aarch64] steps: - uses: actions/checkout@v3 - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - - name: Log in to the Container registry uses: docker/login-action@v1 with: From da83f1b9786ccaf89c5b7b19b5181337aee9e9eb Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 01:57:35 +0400 Subject: [PATCH 06/25] try release directly with image --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 637e787e..e5555e48 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - target: [x86_64, aarch64] + target: [x86_64] steps: - uses: actions/checkout@v3 - name: Set up QEMU @@ -58,7 +58,6 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - uses: messense/maturin-action@v1 with: - container: ghcr.io/rust-cross/manylinux2014-cross:aarch64 target: ${{ matrix.target }} manylinux: auto args: --release --out dist -i python${{ matrix.python-version }} From ce88c30cc3e7b4a1d230a7ec216de75e9fc9146a Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 02:07:00 +0400 Subject: [PATCH 07/25] try release directly with image --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e5555e48..dac4ea0c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,6 +58,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - uses: messense/maturin-action@v1 with: + container: messense/manylinux_2_24-cross:aarch64 target: ${{ matrix.target }} manylinux: auto args: --release --out dist -i python${{ matrix.python-version }} From 7e614a622c61eb3bed8e97387e45a4e385a4f8ed Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 02:32:04 +0400 Subject: [PATCH 08/25] rename docker files --- .github/workflows/release_docker.yml | 7 ++----- docker/release-aarch64.Dockerfile | 10 ++++++++++ .../{release.Dockerfile => release-amd64.Dockerfile} | 3 +-- 3 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 docker/release-aarch64.Dockerfile rename docker/{release.Dockerfile => release-amd64.Dockerfile} (93%) diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml index 3f5c73c3..58baed2e 100644 --- a/.github/workflows/release_docker.yml +++ b/.github/workflows/release_docker.yml @@ -17,8 +17,7 @@ jobs: base_image: quay.io/pypa/manylinux2014_x86_64 label: x86_64 - arch: arm64 - #base_image: ghcr.io/rust-cross/manylinux2014-cross:aarch64 - base_image: messense/manylinux_2_24-cross:aarch64 + base_image: ghcr.io/rust-cross/manylinux2014-cross:aarch64 label: aarch64 steps: - @@ -42,9 +41,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./docker/release.Dockerfile + file: ./docker/release-{{ matrix.arch }}.Dockerfile platforms: linux/${{ matrix.arch }} push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/release-${{ matrix.label }}:latest - build-args: | - base_image=${{ matrix.base_image }} diff --git a/docker/release-aarch64.Dockerfile b/docker/release-aarch64.Dockerfile new file mode 100644 index 00000000..9203b57c --- /dev/null +++ b/docker/release-aarch64.Dockerfile @@ -0,0 +1,10 @@ +FROM ghcr.io/rust-cross/manylinux2014-cross:aarch64 + +# rust image comes with sh, we like bash more +SHELL ["/bin/bash", "-c"] + +RUN apt-get update --fix-missing && \ + apt-get install -y --no-install-recommends \ + gcc-multilib \ + && \ + apt-get clean diff --git a/docker/release.Dockerfile b/docker/release-amd64.Dockerfile similarity index 93% rename from docker/release.Dockerfile rename to docker/release-amd64.Dockerfile index 6979925b..dcd22ec2 100644 --- a/docker/release.Dockerfile +++ b/docker/release-amd64.Dockerfile @@ -1,5 +1,4 @@ -ARG base_image=quay.io/pypa/manylinux2014_x86_64 -FROM $base_image +FROM quay.io/pypa/manylinux2014_x86_64 # rust image comes with sh, we like bash more SHELL ["/bin/bash", "-c"] From c28319ac01cdb428aeb0205caa33e618b92508f5 Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 02:35:02 +0400 Subject: [PATCH 09/25] file matrix vars --- .github/workflows/release_docker.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml index 58baed2e..9172cd39 100644 --- a/.github/workflows/release_docker.yml +++ b/.github/workflows/release_docker.yml @@ -14,10 +14,8 @@ jobs: matrix: include: - arch: amd64 - base_image: quay.io/pypa/manylinux2014_x86_64 label: x86_64 - arch: arm64 - base_image: ghcr.io/rust-cross/manylinux2014-cross:aarch64 label: aarch64 steps: - @@ -41,7 +39,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./docker/release-{{ matrix.arch }}.Dockerfile + file: ./docker/release-${{ matrix.arch }}.Dockerfile platforms: linux/${{ matrix.arch }} push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/release-${{ matrix.label }}:latest From 3bfbaa663aea2f2d34686454a3dbf39beebb5ee9 Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 02:37:08 +0400 Subject: [PATCH 10/25] rename docker file --- docker/{release-aarch64.Dockerfile => release-arm64.Dockerfile} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker/{release-aarch64.Dockerfile => release-arm64.Dockerfile} (100%) diff --git a/docker/release-aarch64.Dockerfile b/docker/release-arm64.Dockerfile similarity index 100% rename from docker/release-aarch64.Dockerfile rename to docker/release-arm64.Dockerfile From fa70d0880610037594de3721a8c2c8e8a2d55b8f Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 03:03:41 +0400 Subject: [PATCH 11/25] gcc multilib arm --- docker/release-arm64.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/release-arm64.Dockerfile b/docker/release-arm64.Dockerfile index 9203b57c..cf828b87 100644 --- a/docker/release-arm64.Dockerfile +++ b/docker/release-arm64.Dockerfile @@ -5,6 +5,6 @@ SHELL ["/bin/bash", "-c"] RUN apt-get update --fix-missing && \ apt-get install -y --no-install-recommends \ - gcc-multilib \ + gcc-multilib-arm-linux-gnueabi \ && \ apt-get clean From 8000b72f8e3d5dbe5d66cf884af8b60a050db309 Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 03:08:46 +0400 Subject: [PATCH 12/25] debug os version --- docker/release-arm64.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/release-arm64.Dockerfile b/docker/release-arm64.Dockerfile index cf828b87..a996a708 100644 --- a/docker/release-arm64.Dockerfile +++ b/docker/release-arm64.Dockerfile @@ -3,6 +3,8 @@ FROM ghcr.io/rust-cross/manylinux2014-cross:aarch64 # rust image comes with sh, we like bash more SHELL ["/bin/bash", "-c"] +RUN uname -a + RUN apt-get update --fix-missing && \ apt-get install -y --no-install-recommends \ gcc-multilib-arm-linux-gnueabi \ From 112cab10fe39606bedf03b1bba6f43b4ed9153eb Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 04:02:53 +0400 Subject: [PATCH 13/25] set gnu target --- .github/workflows/release.yml | 2 +- docker/release-arm64.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dac4ea0c..73013571 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: strategy: matrix: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - target: [aarch64] + target: [aarch64-unknown-linux-gnu] steps: - uses: actions/checkout@v3 - name: Set up QEMU diff --git a/docker/release-arm64.Dockerfile b/docker/release-arm64.Dockerfile index a996a708..cfd5ec05 100644 --- a/docker/release-arm64.Dockerfile +++ b/docker/release-arm64.Dockerfile @@ -7,6 +7,6 @@ RUN uname -a RUN apt-get update --fix-missing && \ apt-get install -y --no-install-recommends \ - gcc-multilib-arm-linux-gnueabi \ + g++-multilib \ && \ apt-get clean From 0fffed5eac3aefb0c3dd10ad0ee1f32bb6ad8ec1 Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 04:08:47 +0400 Subject: [PATCH 14/25] try another image --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 73013571..063e6c24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: strategy: matrix: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - target: [aarch64-unknown-linux-gnu] + target: [aarch64] steps: - uses: actions/checkout@v3 - name: Set up QEMU @@ -58,7 +58,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - uses: messense/maturin-action@v1 with: - container: messense/manylinux_2_24-cross:aarch64 + container: ghcr.io/rust-cross/manylinux_2_28-cross:aarch64 target: ${{ matrix.target }} manylinux: auto args: --release --out dist -i python${{ matrix.python-version }} From 1746ca6fcdd191097860104c9c1a7f0aba6c6235 Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 04:44:21 +0400 Subject: [PATCH 15/25] gcc-aarch64-linux-gnu --- docker/release-arm64.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/release-arm64.Dockerfile b/docker/release-arm64.Dockerfile index cfd5ec05..9064278d 100644 --- a/docker/release-arm64.Dockerfile +++ b/docker/release-arm64.Dockerfile @@ -7,6 +7,6 @@ RUN uname -a RUN apt-get update --fix-missing && \ apt-get install -y --no-install-recommends \ - g++-multilib \ + gcc-aarch64-linux-gnu \ && \ apt-get clean From f695f3e728f5d1a7fcaf6dcb95aa7b0f0d1cffc7 Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 04:50:02 +0400 Subject: [PATCH 16/25] kornia release image --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 063e6c24..fd310f23 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,7 +58,8 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - uses: messense/maturin-action@v1 with: - container: ghcr.io/rust-cross/manylinux_2_28-cross:aarch64 + #container: ghcr.io/rust-cross/manylinux_2_28-cross:aarch64 + container: ghcr.io/kornia/kornia-rs/release-{{ matrix.target }}:latest target: ${{ matrix.target }} manylinux: auto args: --release --out dist -i python${{ matrix.python-version }} From 773a58884ef400d1e34997497cd7f9ed86ee9f3e Mon Sep 17 00:00:00 2001 From: edgar Date: Sat, 7 Jan 2023 04:52:19 +0400 Subject: [PATCH 17/25] typo --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd310f23..5cd2b316 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - uses: messense/maturin-action@v1 with: - container: ghcr.io/kornia/kornia-rs/release-{{ matrix.target }}:latest + container: ghcr.io/kornia/kornia-rs/release-${{ matrix.target }}:latest target: ${{ matrix.target }} manylinux: auto args: --release --out dist -i python${{ matrix.python-version }} @@ -59,7 +59,7 @@ jobs: - uses: messense/maturin-action@v1 with: #container: ghcr.io/rust-cross/manylinux_2_28-cross:aarch64 - container: ghcr.io/kornia/kornia-rs/release-{{ matrix.target }}:latest + container: ghcr.io/kornia/kornia-rs/release-${{ matrix.target }}:latest target: ${{ matrix.target }} manylinux: auto args: --release --out dist -i python${{ matrix.python-version }} From 3c85f5e44b10b9af83827e5fbdcfe27c0c99d13c Mon Sep 17 00:00:00 2001 From: Edgar Riba Date: Sat, 7 Jan 2023 01:35:15 +0000 Subject: [PATCH 18/25] i8 to u8 --- src/dlpack_py.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dlpack_py.rs b/src/dlpack_py.rs index 2f2e74f0..17fe7e70 100644 --- a/src/dlpack_py.rs +++ b/src/dlpack_py.rs @@ -8,7 +8,7 @@ const DLPACK_CAPSULE_NAME: &[u8] = b"dltensor\0"; // desctructor function for the python capsule unsafe extern "C" fn dlpack_capsule_destructor(capsule: *mut pyo3::ffi::PyObject) { - if pyo3::ffi::PyCapsule_IsValid(capsule, DLPACK_CAPSULE_NAME.as_ptr() as *const i8) == 1 { + if pyo3::ffi::PyCapsule_IsValid(capsule, DLPACK_CAPSULE_NAME.as_ptr() as *const u8) == 1 { // println!("Is an invalid capsule!"); return; } @@ -17,7 +17,7 @@ unsafe extern "C" fn dlpack_capsule_destructor(capsule: *mut pyo3::ffi::PyObject let expected_name = CString::new("dltensor").unwrap(); - let current_name_ptr: *const i8 = pyo3::ffi::PyCapsule_GetName(capsule); + let current_name_ptr: *const u8 = pyo3::ffi::PyCapsule_GetName(capsule); let current_name = CStr::from_ptr(current_name_ptr); // println!("Expected Name: {:?}", expected_name); // println!("Current Name: {:?}", current_name); @@ -94,7 +94,7 @@ pub fn cvtensor_to_dlpack(x: &cv::Tensor, py: Python) -> PyResult { let capsule: PyObject = unsafe { let ptr = pyo3::ffi::PyCapsule_New( &*dlm_tensor_bx as *const dlpack::DLManagedTensor as *mut c_void, - DLPACK_CAPSULE_NAME.as_ptr() as *const i8, + DLPACK_CAPSULE_NAME.as_ptr() as *const u8, Some(dlpack_capsule_destructor as pyo3::ffi::PyCapsule_Destructor), ); PyObject::from_owned_ptr(py, ptr) From 93073cecbe44747b258ec548a85e0b0f233bf8e0 Mon Sep 17 00:00:00 2001 From: Edgar Riba Date: Sat, 7 Jan 2023 01:47:15 +0000 Subject: [PATCH 19/25] cchar --- src/dlpack_py.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/dlpack_py.rs b/src/dlpack_py.rs index 17fe7e70..6f451e2e 100644 --- a/src/dlpack_py.rs +++ b/src/dlpack_py.rs @@ -3,12 +3,13 @@ use dlpack_rs as dlpack; use pyo3::prelude::*; use std::ffi::{c_void, CStr, CString}; +use std::os::raw::c_char; const DLPACK_CAPSULE_NAME: &[u8] = b"dltensor\0"; // desctructor function for the python capsule unsafe extern "C" fn dlpack_capsule_destructor(capsule: *mut pyo3::ffi::PyObject) { - if pyo3::ffi::PyCapsule_IsValid(capsule, DLPACK_CAPSULE_NAME.as_ptr() as *const u8) == 1 { + if pyo3::ffi::PyCapsule_IsValid(capsule, DLPACK_CAPSULE_NAME.as_ptr() as *const c_char) == 1 { // println!("Is an invalid capsule!"); return; } @@ -17,7 +18,7 @@ unsafe extern "C" fn dlpack_capsule_destructor(capsule: *mut pyo3::ffi::PyObject let expected_name = CString::new("dltensor").unwrap(); - let current_name_ptr: *const u8 = pyo3::ffi::PyCapsule_GetName(capsule); + let current_name_ptr: *const c_char = pyo3::ffi::PyCapsule_GetName(capsule); let current_name = CStr::from_ptr(current_name_ptr); // println!("Expected Name: {:?}", expected_name); // println!("Current Name: {:?}", current_name); @@ -94,7 +95,7 @@ pub fn cvtensor_to_dlpack(x: &cv::Tensor, py: Python) -> PyResult { let capsule: PyObject = unsafe { let ptr = pyo3::ffi::PyCapsule_New( &*dlm_tensor_bx as *const dlpack::DLManagedTensor as *mut c_void, - DLPACK_CAPSULE_NAME.as_ptr() as *const u8, + DLPACK_CAPSULE_NAME.as_ptr() as *const c_char, Some(dlpack_capsule_destructor as pyo3::ffi::PyCapsule_Destructor), ); PyObject::from_owned_ptr(py, ptr) From 4084bac1ebcc69d92db3d89a81b111daee4a7988 Mon Sep 17 00:00:00 2001 From: Edgar Riba Date: Sat, 7 Jan 2023 10:21:20 +0400 Subject: [PATCH 20/25] Simplify release --- .github/workflows/release.yml | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5cd2b316..68165e91 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - target: [x86_64] + target: [x86_64, aarch64] steps: - uses: actions/checkout@v3 - name: Set up QEMU @@ -37,38 +37,7 @@ jobs: with: name: wheels path: dist - - linux-aarch64: - runs-on: ubuntu-latest - strategy: - matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - target: [aarch64] - steps: - - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Log in to the Container registry - uses: docker/login-action@v1 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - uses: messense/maturin-action@v1 - with: - #container: ghcr.io/rust-cross/manylinux_2_28-cross:aarch64 - container: ghcr.io/kornia/kornia-rs/release-${{ matrix.target }}:latest - target: ${{ matrix.target }} - manylinux: auto - args: --release --out dist -i python${{ matrix.python-version }} - - name: Upload wheels - uses: actions/upload-artifact@v2 - with: - name: wheels - path: dist - + macos: runs-on: macos-latest strategy: From 76a9551a80796df607a861216728316ecd0ec03b Mon Sep 17 00:00:00 2001 From: Edgar Riba Date: Sat, 7 Jan 2023 10:25:39 +0400 Subject: [PATCH 21/25] Rename release-arm64.Dockerfile to release-aarch64.Dockerfile --- docker/{release-arm64.Dockerfile => release-aarch64.Dockerfile} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker/{release-arm64.Dockerfile => release-aarch64.Dockerfile} (100%) diff --git a/docker/release-arm64.Dockerfile b/docker/release-aarch64.Dockerfile similarity index 100% rename from docker/release-arm64.Dockerfile rename to docker/release-aarch64.Dockerfile From 30b9075a0af8cb766c9b9e4e2167dcc5be0bbb2d Mon Sep 17 00:00:00 2001 From: Edgar Riba Date: Sat, 7 Jan 2023 10:26:05 +0400 Subject: [PATCH 22/25] Update release_docker.yml --- .github/workflows/release_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml index 9172cd39..cffd0e97 100644 --- a/.github/workflows/release_docker.yml +++ b/.github/workflows/release_docker.yml @@ -39,7 +39,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./docker/release-${{ matrix.arch }}.Dockerfile + file: ./docker/release-${{ matrix.label }}.Dockerfile platforms: linux/${{ matrix.arch }} push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/release-${{ matrix.label }}:latest From 1ea34d9840827068905f9d8a95cb2ea0f7f5d5c7 Mon Sep 17 00:00:00 2001 From: Edgar Riba Date: Sat, 7 Jan 2023 10:27:31 +0400 Subject: [PATCH 23/25] Update release_docker.yml --- .github/workflows/release_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml index cffd0e97..9172cd39 100644 --- a/.github/workflows/release_docker.yml +++ b/.github/workflows/release_docker.yml @@ -39,7 +39,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./docker/release-${{ matrix.label }}.Dockerfile + file: ./docker/release-${{ matrix.arch }}.Dockerfile platforms: linux/${{ matrix.arch }} push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/release-${{ matrix.label }}:latest From a2d5fe7c5f08d385e7b6ced33f63da49f15988a5 Mon Sep 17 00:00:00 2001 From: Edgar Riba Date: Sat, 7 Jan 2023 10:27:58 +0400 Subject: [PATCH 24/25] Rename release-aarch64.Dockerfile to release-arm64.Dockerfile --- docker/{release-aarch64.Dockerfile => release-arm64.Dockerfile} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker/{release-aarch64.Dockerfile => release-arm64.Dockerfile} (100%) diff --git a/docker/release-aarch64.Dockerfile b/docker/release-arm64.Dockerfile similarity index 100% rename from docker/release-aarch64.Dockerfile rename to docker/release-arm64.Dockerfile From 96266d21c6b4fc0d41ed0d7971597f180f500122 Mon Sep 17 00:00:00 2001 From: Edgar Riba Date: Sat, 7 Jan 2023 10:28:41 +0400 Subject: [PATCH 25/25] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 68165e91..8d6655ec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: with: name: wheels path: dist - + macos: runs-on: macos-latest strategy: