From fdcf01197f916ef6b547895fd44cdbb03b489df8 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 9 Oct 2023 15:02:43 -0700 Subject: [PATCH 1/6] WIP: enable macos --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fa268de..eadeae6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: # TODO: macos-latest cannot yet be included in the list because a dependency cannot be # found ("dyld: Library not loaded; '@rpath/libopenvino.2310.dylib'"). See # https://github.com/abrown/openvino-rs/actions/runs/6423141936/job/17441022932#step:7:154 - os: [ubuntu-20.04, ubuntu-22.04, windows-latest] + os: [ubuntu-20.04, ubuntu-22.04, windows-latest, macos-latest] version: [2022.3.0, 2023.0.1, 2023.1.0] apt: [false] # We also spot-check that things work when installing from APT by adding to the matrix: see From 63433b5c95ba6125dbdd03edb42896cbd3e00554 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 9 Oct 2023 15:53:50 -0700 Subject: [PATCH 2/6] experiment: add realpath on macos --- .github/workflows/main.yml | 7 +++++++ ci/realpath | 4 ++++ 2 files changed, 11 insertions(+) create mode 100755 ci/realpath diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eadeae6..8817716 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,6 +38,13 @@ jobs: lfs: true - name: Checkout LFS objects run: git lfs checkout + - name: Add realpath + run: | + echo $PATH + mv ci/realpath /usr/bin + chmod +x /usr/bin/realpath + ls -al /usr/bin/realpath + if: ${{ !startsWith(runner.os, 'macos') }} - uses: abrown/install-openvino-action@fe7412dddbed9fbd2243731a8d49f1bc55c2ba20 with: version: ${{ matrix.version }} diff --git a/ci/realpath b/ci/realpath new file mode 100755 index 0000000..6c7935c --- /dev/null +++ b/ci/realpath @@ -0,0 +1,4 @@ +#!/usr/bin/env python +import os +import sys +print(os.path.realpath(sys.argv[1])) From 0333c3d734ed876744c4d6560e778d7026af22e2 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 9 Oct 2023 15:56:49 -0700 Subject: [PATCH 3/6] experiment: invert condition --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8817716..d31e10c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,7 @@ jobs: mv ci/realpath /usr/bin chmod +x /usr/bin/realpath ls -al /usr/bin/realpath - if: ${{ !startsWith(runner.os, 'macos') }} + if: ${{ startsWith(runner.os, 'macos') }} - uses: abrown/install-openvino-action@fe7412dddbed9fbd2243731a8d49f1bc55c2ba20 with: version: ${{ matrix.version }} From b96350373ddf4484ee9c22994bee1ec4a155ce25 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 9 Oct 2023 16:00:36 -0700 Subject: [PATCH 4/6] experiment: add ci to path --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d31e10c..212623b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,9 +41,9 @@ jobs: - name: Add realpath run: | echo $PATH - mv ci/realpath /usr/bin - chmod +x /usr/bin/realpath - ls -al /usr/bin/realpath + chmod +x ci/realpath + ls -al ci/realpath + echo PATH="ci:$PATH" >> $GITHUB_ENV if: ${{ startsWith(runner.os, 'macos') }} - uses: abrown/install-openvino-action@fe7412dddbed9fbd2243731a8d49f1bc55c2ba20 with: From f63acdc1ecd39eb20c35ab9f9ffdc94c1b15a77b Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 9 Oct 2023 16:09:12 -0700 Subject: [PATCH 5/6] experiment: ignore dynamic linking on macos --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 212623b..0f4f727 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,7 +64,7 @@ jobs: run: cargo test # TODO: the finder does not yet know how to distinguish between `*.lib` (required here) and # `*.dll` (required by runtime-linking). - if: ${{ !startsWith(runner.os, 'windows') }} + if: ${{ !startsWith(runner.os, 'windows') && !startsWith(runner.os, 'macos') }} # Finally, run the runtime-linking tests: the binddings do not link at build time, instead # as the tests are run. - name: Check runtime linking From 716874004de3d904c222735b3d8993bb223bd1b5 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 9 Oct 2023 16:41:58 -0700 Subject: [PATCH 6/6] Print loader events --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0f4f727..3628d91 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,6 +69,8 @@ jobs: # as the tests are run. - name: Check runtime linking run: cargo test --features openvino-sys/runtime-linking + env: + DYLD_PRINT_LIBRARIES: 1 format: name: Check code format