From 98348f1538917ed91c3bf8ee144c7c5faebb5e84 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Sun, 7 Feb 2021 19:16:05 -0800 Subject: [PATCH 01/47] Updating to v2.2.11.1 --- macOS-10.13-azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macOS-10.13-azure-pipelines.yml b/macOS-10.13-azure-pipelines.yml index 8527fb6..04c8e20 100644 --- a/macOS-10.13-azure-pipelines.yml +++ b/macOS-10.13-azure-pipelines.yml @@ -25,7 +25,7 @@ jobs: src.vcpkg: '$(Agent.BuildDirectory)/s/src/vcpkg' tests: '$(Agent.BuildDirectory)/s/tests' install.vcpkg: $(Agent.BuildDirectory)/s/vcpkg - oiio.version: '2.0.5' + oiio.version: '2.2.11.1' pypackage.os_name: 'Microsoft :: MacOS' pool: From 656184f98c49f4de5fafdd034d6d23cced8f804a Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Sun, 7 Feb 2021 19:19:47 -0800 Subject: [PATCH 02/47] Update python3.6 --- src/vcpkg/ports/openimageio-py3.6/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vcpkg/ports/openimageio-py3.6/portfile.cmake b/src/vcpkg/ports/openimageio-py3.6/portfile.cmake index 8fb5bb5..ff4bd72 100644 --- a/src/vcpkg/ports/openimageio-py3.6/portfile.cmake +++ b/src/vcpkg/ports/openimageio-py3.6/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF Release-2.0.5 - SHA512 2bf6b3d998e9b7bda90b9dfd3e30702c3c857f6f90ab8be10fd3dc9617ecccc62464a8198a7804d130bdb39b2475c1ce14af129b8ccc371a21e92c2e637a5413 + REF v2.2.11.1 + SHA512 1 HEAD_REF master PATCHES # fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES' From 68d4f9ed21f74029739cc1b3816803b6a34cbabf Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Sun, 7 Feb 2021 19:20:03 -0800 Subject: [PATCH 03/47] Update portfile.cmake --- src/vcpkg/ports/openimageio-py3.7/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vcpkg/ports/openimageio-py3.7/portfile.cmake b/src/vcpkg/ports/openimageio-py3.7/portfile.cmake index cc5fe76..d7b3be4 100644 --- a/src/vcpkg/ports/openimageio-py3.7/portfile.cmake +++ b/src/vcpkg/ports/openimageio-py3.7/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF Release-2.0.5 - SHA512 2bf6b3d998e9b7bda90b9dfd3e30702c3c857f6f90ab8be10fd3dc9617ecccc62464a8198a7804d130bdb39b2475c1ce14af129b8ccc371a21e92c2e637a5413 + REF v2.2.11.1 + SHA512 1 HEAD_REF master PATCHES # fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES' From eaedf92485205f548fded2ee0c0554c9e4965743 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Sun, 7 Feb 2021 19:20:34 -0800 Subject: [PATCH 04/47] Update ubuntu16.04-azure-pipelines.yml --- ubuntu16.04-azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu16.04-azure-pipelines.yml b/ubuntu16.04-azure-pipelines.yml index 6a17505..5d4b98c 100644 --- a/ubuntu16.04-azure-pipelines.yml +++ b/ubuntu16.04-azure-pipelines.yml @@ -24,7 +24,7 @@ jobs: src.vcpkg: '$(Agent.BuildDirectory)/s/src/vcpkg' tests: '$(Agent.BuildDirectory)/s/tests' install.vcpkg: $(Agent.BuildDirectory)/s/vcpkg - oiio.version: '2.0.5' + oiio.version: '2.2.11.1' pypackage.os_name: 'Microsoft :: POSIX :: Linux' pool: From 57fd0d7b0dc88fdb58d3ae6ebb6842e791d68d16 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Sun, 7 Feb 2021 19:20:50 -0800 Subject: [PATCH 05/47] Update win2016-azure-pipelines.yml --- win2016-azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win2016-azure-pipelines.yml b/win2016-azure-pipelines.yml index 560c427..c90d40f 100644 --- a/win2016-azure-pipelines.yml +++ b/win2016-azure-pipelines.yml @@ -23,7 +23,7 @@ jobs: src.python: '$(Agent.BuildDirectory)/s/src/python' src.vcpkg: '$(Agent.BuildDirectory)/s/src/vcpkg' tests: '$(Agent.BuildDirectory)/s/tests' - oiio.version: '2.0.5' + oiio.version: '2.2.11.1' pypackage.os_name: 'Microsoft :: Windows' pool: From 1585b059cb53a4e7dd5e879f31d321c787bd14ad Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Sun, 7 Feb 2021 19:24:20 -0800 Subject: [PATCH 06/47] Update ubuntu16.04-azure-pipelines.yml --- ubuntu16.04-azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu16.04-azure-pipelines.yml b/ubuntu16.04-azure-pipelines.yml index 5d4b98c..69aa19f 100644 --- a/ubuntu16.04-azure-pipelines.yml +++ b/ubuntu16.04-azure-pipelines.yml @@ -161,7 +161,7 @@ jobs: - task: GithubRelease@0 inputs: gitHubConnection: 'oiio-python-releases' - repositoryName: 'fredrikaverpil/oiio-python' + repositoryName: 'ArchPlatform/oiio-python' action: 'edit' # Options: create, edit, discard target: '$(build.sourceVersion)' # Required when action == create || action == edit tagSource: 'Git tag' # Required when action == create. Options: auto, manual From 427c48de25e28b3c7730ed5066df52318642e324 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Sun, 7 Feb 2021 19:24:54 -0800 Subject: [PATCH 07/47] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b08b72b..bc7173e 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ OpenImageIO Python 3.x package. | Build pipeline | CI Status | | ------------- | ------------- | -| Windows Server 2016 | [![Build Status](https://fredrikaverpil.visualstudio.com/oiio-python/_apis/build/status/oiio-python-win2016?branchName=master)](https://fredrikaverpil.visualstudio.com/oiio-python/_build/latest?definitionId=5?branchName=master) | -| Ubuntu 16.041 | [![Build Status](https://fredrikaverpil.visualstudio.com/oiio-python/_apis/build/status/oiio-python-ubuntu16.04?branchName=master)](https://fredrikaverpil.visualstudio.com/oiio-python/_build/latest?definitionId=6?branchName=master) | -| macOS 10.13 | [![Build Status](https://fredrikaverpil.visualstudio.com/oiio-python/_apis/build/status/oiio-python-macOS-10.13?branchName=master)](https://fredrikaverpil.visualstudio.com/oiio-python/_build/latest?definitionId=7&branchName=master) | +| Windows Server 2016 | [![Build Status](https://ArchPlatform.visualstudio.com/oiio-python/_apis/build/status/oiio-python-win2016?branchName=master)](https://ArchPlatform.visualstudio.com/oiio-python/_build/latest?definitionId=5?branchName=master) | +| Ubuntu 16.041 | [![Build Status](https://ArchPlatform.visualstudio.com/oiio-python/_apis/build/status/oiio-python-ubuntu16.04?branchName=master)](https://ArchPlatform.visualstudio.com/oiio-python/_build/latest?definitionId=6?branchName=master) | +| macOS 10.13 | [![Build Status](https://ArchPlatform.visualstudio.com/oiio-python/_apis/build/status/oiio-python-macOS-10.13?branchName=master)](https://ArchPlatform.visualstudio.com/oiio-python/_build/latest?definitionId=7&branchName=master) | 1 Should also work on CentOS 7 for example. @@ -37,4 +37,4 @@ See the `tests` folder for code examples used to test the built wheels' function - A new release is automatically performed when a commit is performed on the `master` branch. - Updating to a newer OpenImageIO version: 1. Update the `oiio.version` variable in the .yml files - 2. Update the version and SHA512 in the OpenImageIO port files. \ No newline at end of file + 2. Update the version and SHA512 in the OpenImageIO port files. From e49e3b7e347dc38809632be47f465db3b3dc8642 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Sun, 7 Feb 2021 19:26:01 -0800 Subject: [PATCH 08/47] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bc7173e..e75487e 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ OpenImageIO Python 3.x package. | Build pipeline | CI Status | | ------------- | ------------- | -| Windows Server 2016 | [![Build Status](https://ArchPlatform.visualstudio.com/oiio-python/_apis/build/status/oiio-python-win2016?branchName=master)](https://ArchPlatform.visualstudio.com/oiio-python/_build/latest?definitionId=5?branchName=master) | -| Ubuntu 16.041 | [![Build Status](https://ArchPlatform.visualstudio.com/oiio-python/_apis/build/status/oiio-python-ubuntu16.04?branchName=master)](https://ArchPlatform.visualstudio.com/oiio-python/_build/latest?definitionId=6?branchName=master) | -| macOS 10.13 | [![Build Status](https://ArchPlatform.visualstudio.com/oiio-python/_apis/build/status/oiio-python-macOS-10.13?branchName=master)](https://ArchPlatform.visualstudio.com/oiio-python/_build/latest?definitionId=7&branchName=master) | +| Windows Server 2016 | [![Build Status](https://Ahuge.visualstudio.com/oiio-python/_apis/build/status/oiio-python-win2016?branchName=master)](https://Ahuge.visualstudio.com/oiio-python/_build/latest?definitionId=5?branchName=master) | +| Ubuntu 16.041 | [![Build Status](https://Ahuge.visualstudio.com/oiio-python/_apis/build/status/oiio-python-ubuntu16.04?branchName=master)](https://Ahuge.visualstudio.com/oiio-python/_build/latest?definitionId=6?branchName=master) | +| macOS 10.13 | [![Build Status](https://Ahuge.visualstudio.com/oiio-python/_apis/build/status/oiio-python-macOS-10.13?branchName=master)](https://Ahuge.visualstudio.com/oiio-python/_build/latest?definitionId=7&branchName=master) | 1 Should also work on CentOS 7 for example. From 0015d2c567373ab86bf98126b379935d8b3ae676 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Sun, 7 Feb 2021 19:28:44 -0800 Subject: [PATCH 09/47] Update macOS-10.13-azure-pipelines.yml --- macOS-10.13-azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macOS-10.13-azure-pipelines.yml b/macOS-10.13-azure-pipelines.yml index 04c8e20..8528114 100644 --- a/macOS-10.13-azure-pipelines.yml +++ b/macOS-10.13-azure-pipelines.yml @@ -153,7 +153,7 @@ jobs: - task: GithubRelease@0 inputs: gitHubConnection: 'oiio-python-releases' - repositoryName: 'fredrikaverpil/oiio-python' + repositoryName: 'ArchPlatform/oiio-python' action: 'edit' # Options: create, edit, discard target: '$(build.sourceVersion)' # Required when action == create || action == edit tagSource: 'Git tag' # Required when action == create. Options: auto, manual From 5cdf6c6c491dcf05f5f2bd3c4789ec50e1622eb6 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Sun, 7 Feb 2021 19:30:27 -0800 Subject: [PATCH 10/47] Update win2016-azure-pipelines.yml --- win2016-azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win2016-azure-pipelines.yml b/win2016-azure-pipelines.yml index c90d40f..ea3917e 100644 --- a/win2016-azure-pipelines.yml +++ b/win2016-azure-pipelines.yml @@ -189,7 +189,7 @@ jobs: - task: GithubRelease@0 inputs: gitHubConnection: 'oiio-python-releases' - repositoryName: 'fredrikaverpil/oiio-python' + repositoryName: 'ArchPlatform/oiio-python' action: 'edit' # Options: create, edit, discard target: '$(build.sourceVersion)' # Required when action == create || action == edit tagSource: 'Git tag' # Required when action == create. Options: auto, manual From d51d0744d2ee8b8282e0bd35ed29af891bb0a8be Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 08:24:16 -0800 Subject: [PATCH 11/47] Create build.yml --- .github/workflows/build.yml | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..f463796 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,44 @@ +# Build openimageio for python + +on: + push: + + workflow_dispatch: + + +jobs: + + linux: + runs-on: ubuntu-16.04 + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: "3.7" + + # Build oiio + - name: Build oiio + run: | + sudo apt-get install libboost-all-dev + sudo apt-get install libjpeg-dev + sudo apt-get install zlib1g-dev + sudo apt-get install libpng-dev + sudo apt-get install libtiff-dev + sudo apt-get install libopenexr-dev + git clone https://github.com/OpenImageIO/oiio.git + pip3 install "pybind11[global]" + pip3 install numpy + cd oiio + make + shell: bash + env: + OIIO_PYTHON_VERSION: "3.7" + + + - name: Show contents + run: | + ls -lah + cd dist + ls -lah + shell: bash From a8537b5c4d0d6642f3a7982a22fa409e7f04fe49 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 08:34:53 -0800 Subject: [PATCH 12/47] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f463796..b924110 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,7 @@ jobs: sudo apt-get install libtiff-dev sudo apt-get install libopenexr-dev git clone https://github.com/OpenImageIO/oiio.git + git checkout v2.2.11.1 pip3 install "pybind11[global]" pip3 install numpy cd oiio From 1b27d8424da884d31e10cd9fe18e401fce4cae4e Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 08:45:04 -0800 Subject: [PATCH 13/47] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b924110..f2d811a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,11 +26,11 @@ jobs: sudo apt-get install libpng-dev sudo apt-get install libtiff-dev sudo apt-get install libopenexr-dev - git clone https://github.com/OpenImageIO/oiio.git - git checkout v2.2.11.1 + git clone https://github.com/OpenImageIO/oiio.git pip3 install "pybind11[global]" pip3 install numpy cd oiio + git checkout v2.2.11.1 make shell: bash env: From f68fdc80d8f14ae9800d6032098b818b78f7c47c Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 08:58:16 -0800 Subject: [PATCH 14/47] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2d811a..b2ebae3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,12 +26,13 @@ jobs: sudo apt-get install libpng-dev sudo apt-get install libtiff-dev sudo apt-get install libopenexr-dev + sudo apt-get install libraw-dev git clone https://github.com/OpenImageIO/oiio.git pip3 install "pybind11[global]" pip3 install numpy cd oiio git checkout v2.2.11.1 - make + make VERBOSE=1 STOP_ON_WARNING=0 shell: bash env: OIIO_PYTHON_VERSION: "3.7" From 553ca4c1379273a5e3f67e3a1d58061e6bc97b5b Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 09:00:38 -0800 Subject: [PATCH 15/47] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2ebae3..6e3e106 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,7 @@ jobs: pip3 install numpy cd oiio git checkout v2.2.11.1 + gcc --version make VERBOSE=1 STOP_ON_WARNING=0 shell: bash env: From 58971f14209f15539135a2116fb509bc8da94b5f Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 09:05:41 -0800 Subject: [PATCH 16/47] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e3e106..b70f1fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: pip3 install "pybind11[global]" pip3 install numpy cd oiio - git checkout v2.2.11.1 + git checkout v2.2.10.0 gcc --version make VERBOSE=1 STOP_ON_WARNING=0 shell: bash From 2ff71d3c566380ca19a8bf56f4af107744b1af1c Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 09:11:41 -0800 Subject: [PATCH 17/47] Update build.yml --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b70f1fd..e5ef6a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,9 @@ jobs: sudo apt-get install libtiff-dev sudo apt-get install libopenexr-dev sudo apt-get install libraw-dev + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo apt-get update -y + sudo apt-get install g++-7 -y git clone https://github.com/OpenImageIO/oiio.git pip3 install "pybind11[global]" pip3 install numpy From ae4a580e4dc17f7b664d46601217c8f8f406c145 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 09:24:57 -0800 Subject: [PATCH 18/47] Update build.yml --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5ef6a3..cd4cbaa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,9 @@ jobs: pip3 install numpy cd oiio git checkout v2.2.10.0 + mkdir build + cd build + cmake .. gcc --version make VERBOSE=1 STOP_ON_WARNING=0 shell: bash From ecb5bebd194a69cd76567f9b59fd4456925a1bb7 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 09:36:14 -0800 Subject: [PATCH 19/47] Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd4cbaa..e50bb30 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,6 +37,8 @@ jobs: git checkout v2.2.10.0 mkdir build cd build + export CFLAGS=-Wno-unused-function + export CXXFLAGS=-Wno-unused-function cmake .. gcc --version make VERBOSE=1 STOP_ON_WARNING=0 From d3f6d44d3be127b68c97afd68a17d8057cc8b14f Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 09:46:08 -0800 Subject: [PATCH 20/47] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e50bb30..fe20a02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,8 +37,8 @@ jobs: git checkout v2.2.10.0 mkdir build cd build - export CFLAGS=-Wno-unused-function - export CXXFLAGS=-Wno-unused-function + export CFLAGS=-Werror=unused-variable + export CXXFLAGS=-Werror=unused-variable cmake .. gcc --version make VERBOSE=1 STOP_ON_WARNING=0 From 6f9268f8a5300db5f0fe501d6f8d8deafe9dfda5 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 09:56:31 -0800 Subject: [PATCH 21/47] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe20a02..a6f2e3c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: cd build export CFLAGS=-Werror=unused-variable export CXXFLAGS=-Werror=unused-variable - cmake .. + cmake .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-variable" gcc --version make VERBOSE=1 STOP_ON_WARNING=0 shell: bash From ff4c1fd4bf387cd5d7175d27b779ec88e058debe Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 10:23:52 -0800 Subject: [PATCH 22/47] Update build.yml --- .github/workflows/build.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6f2e3c..02480a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,10 +46,34 @@ jobs: env: OIIO_PYTHON_VERSION: "3.7" + - name: Inject variable values into setup.py + run: | + cd src/python + sed -i'' 's/PACKAGE_VERSION/2.2.10.0/g' setup.py + sed -i'' 's/PYTHON_VERSION/3.7.9/g' setup.py + sed -i'' 's/OS_NAME/Microsoft :: POSIX :: Linux/g' setup.py + cat setup.py - name: Show contents run: | + ls -lah + cd oiio ls -lah cd dist ls -lah shell: bash + - name: Copy files into oiio Python package + run: | + cp oiio/dist/lib/python3.7/site-packages/*.so src/python/oiio + - name: Build wheel + run: | + mkdir dist + export DIST_DIR="$(PWD)/dist" + cd src/python + python3.7 -m pip install -U pip + pip3.7 install -U setuptools wheel + python3 setup.py bdist_wheel --python-tag=37 --plat-name=linux_x86_64 --dist-dir="$DIST_DIR" + cd $DIST_DIR + ls -lah + + From ce5b45058bd003a1a88cbd992f4af01c4e512c89 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 10:47:57 -0800 Subject: [PATCH 23/47] Update build.yml --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02480a5..c0d296d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,8 +58,13 @@ jobs: run: | ls -lah cd oiio + echo "oiio" ls -lah + cd build + echo "oiio/build" + ls -lah cd dist + echo "oiio/build/dist" ls -lah shell: bash - name: Copy files into oiio Python package From fa2e96747bc75e9c92b51ae2ebccfa9049a45fd9 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 11:09:06 -0800 Subject: [PATCH 24/47] Update build.yml --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0d296d..09eb213 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,6 +63,12 @@ jobs: cd build echo "oiio/build" ls -lah + echo "oiio/ext" + cd ../ext + ls -lah + echo "oiio/build/lib" + cd ../build/lib + ls -lah cd dist echo "oiio/build/dist" ls -lah From 0aa6c94c47da01eaaca53dd6eb7ca756e9db6615 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 11:29:41 -0800 Subject: [PATCH 25/47] Update build.yml --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09eb213..86ccfa0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,13 +69,13 @@ jobs: echo "oiio/build/lib" cd ../build/lib ls -lah - cd dist - echo "oiio/build/dist" + echo "oiio/build/lib/python" + cd ../build/lib/python ls -lah shell: bash - name: Copy files into oiio Python package run: | - cp oiio/dist/lib/python3.7/site-packages/*.so src/python/oiio + cp oiio/build/lib/python/site-packages/*.so src/python/oiio - name: Build wheel run: | mkdir dist From d843d3d45c7473d593a1601f35d25e17b6ba5a6a Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 11:54:22 -0800 Subject: [PATCH 26/47] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86ccfa0..9f5dccf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,7 +70,7 @@ jobs: cd ../build/lib ls -lah echo "oiio/build/lib/python" - cd ../build/lib/python + cd python ls -lah shell: bash - name: Copy files into oiio Python package From 8a7f2fc5239554999e7a2567f01d5f46b0c04964 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 12:36:52 -0800 Subject: [PATCH 27/47] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f5dccf..d3bae9c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,7 +79,7 @@ jobs: - name: Build wheel run: | mkdir dist - export DIST_DIR="$(PWD)/dist" + export DIST_DIR="$GITHUB_WORKSPACE/dist" cd src/python python3.7 -m pip install -U pip pip3.7 install -U setuptools wheel From a0789ea1e607bca0807d7bc400e130d15a7fde04 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 13:14:26 -0800 Subject: [PATCH 28/47] Update build.yml --- .github/workflows/build.yml | 161 ++++++++++++++++++------------------ 1 file changed, 80 insertions(+), 81 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3bae9c..1f2c56d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,90 +1,89 @@ # Build openimageio for python on: - push: + release: + types: [published] - workflow_dispatch: jobs: - - linux: - runs-on: ubuntu-16.04 - + build: + name: Test on ${{ matrix.os }} with Python ${{ matrix.python }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + python: ['3.7'] + os: ['ubuntu-16.04'] + oiio_version: ["2.2.10.0"] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: "3.7" - - # Build oiio - - name: Build oiio - run: | - sudo apt-get install libboost-all-dev - sudo apt-get install libjpeg-dev - sudo apt-get install zlib1g-dev - sudo apt-get install libpng-dev - sudo apt-get install libtiff-dev - sudo apt-get install libopenexr-dev - sudo apt-get install libraw-dev - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update -y - sudo apt-get install g++-7 -y - git clone https://github.com/OpenImageIO/oiio.git - pip3 install "pybind11[global]" - pip3 install numpy - cd oiio - git checkout v2.2.10.0 - mkdir build - cd build - export CFLAGS=-Werror=unused-variable - export CXXFLAGS=-Werror=unused-variable - cmake .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-variable" - gcc --version - make VERBOSE=1 STOP_ON_WARNING=0 - shell: bash - env: - OIIO_PYTHON_VERSION: "3.7" - - - name: Inject variable values into setup.py - run: | - cd src/python - sed -i'' 's/PACKAGE_VERSION/2.2.10.0/g' setup.py - sed -i'' 's/PYTHON_VERSION/3.7.9/g' setup.py - sed -i'' 's/OS_NAME/Microsoft :: POSIX :: Linux/g' setup.py - cat setup.py - - - name: Show contents - run: | - ls -lah - cd oiio - echo "oiio" - ls -lah - cd build - echo "oiio/build" - ls -lah - echo "oiio/ext" - cd ../ext - ls -lah - echo "oiio/build/lib" - cd ../build/lib - ls -lah - echo "oiio/build/lib/python" - cd python - ls -lah - shell: bash - - name: Copy files into oiio Python package - run: | - cp oiio/build/lib/python/site-packages/*.so src/python/oiio - - name: Build wheel - run: | - mkdir dist - export DIST_DIR="$GITHUB_WORKSPACE/dist" - cd src/python - python3.7 -m pip install -U pip - pip3.7 install -U setuptools wheel - python3 setup.py bdist_wheel --python-tag=37 --plat-name=linux_x86_64 --dist-dir="$DIST_DIR" - cd $DIST_DIR - ls -lah + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python }} + architecture: x64 + - name: build oiio + run: | + sudo apt-get install libboost-all-dev + sudo apt-get install libjpeg-dev + sudo apt-get install zlib1g-dev + sudo apt-get install libpng-dev + sudo apt-get install libtiff-dev + sudo apt-get install libopenexr-dev + sudo apt-get install libraw-dev + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo apt-get update -y + sudo apt-get install g++-7 -y + git clone https://github.com/OpenImageIO/oiio.git + pip3 install "pybind11[global]" + pip3 install numpy + cd oiio + git checkout "v${{ matrix.oiio_version }}" + mkdir build + cd build + export CFLAGS=-Werror=unused-variable + export CXXFLAGS=-Werror=unused-variable + cmake .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-variable" + make VERBOSE=1 STOP_ON_WARNING=0 + shell: bash + env: + OIIO_PYTHON_VERSION: ${{ matrix.python }} - + - name: Inject variable values into setup.py + run: | + cd src/python + sed -i'' 's/PACKAGE_VERSION/${{ matrix.oiio_version }}/g' setup.py + sed -i'' 's/PYTHON_VERSION/${{ matrix.python }}/g' setup.py + sed -i'' 's/OS_NAME/Microsoft :: POSIX :: Linux/g' setup.py + cat setup.py + - name: Copy files into oiio Python package + run: | + cp oiio/build/lib/python/site-packages/*.so src/python/oiio + - name: Build wheel + run: | + mkdir ${GITHUB_WORKSPACE}/artifacts + export DIST_DIR="${GITHUB_WORKSPACE}/artifacts" + cd src/python + python3.7 -m pip install -U pip + pip3.7 install -U setuptools wheel + python3 setup.py bdist_wheel --python-tag=py37 --plat-name=linux_x86_64 --dist-dir="$DIST_DIR" + cd $DIST_DIR + ls -lah + echo ::set-output name=asset-name::oiio-2.2.10.0-py37-none-linux_x86_64.whl + echo ::set-output name=asset-path::${GITHUB_WORKSPACE}/artifacts/oiio-2.2.10.0-py37-none-linux_x86_64.whl + - name: Generate Upload URL + id: gen-upload-url + run: | + sudo apt-get install jq; + RELEASE_ID=$(jq --raw-output '.release.id' $GITHUB_EVENT_PATH); + echo ::set-output name=upload-url::https://uploads.github.com/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets + - name: Uplopad Release Asset + id: upload-release-asset + uses: actions/upload-release-asset@v1.0.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.gen-upload-url.outputs.upload-url }}?name=${{ steps.build-zip.outputs.asset-name }} + asset_path: ${{ steps.build-zip.outputs.asset-path }} + asset_name: ${{ steps.build-zip.outputs.asset-name }} + asset_content_type: application/zip From 797de157525ee7ff40847ce8d76db3886b7956fe Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 13:33:16 -0800 Subject: [PATCH 29/47] Use auditwheel --- .github/workflows/build.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f2c56d..3377fbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,14 +13,15 @@ jobs: strategy: fail-fast: false matrix: - python: ['3.7'] + python_version_major: ['3'] + python_version_minor: ['7'] os: ['ubuntu-16.04'] oiio_version: ["2.2.10.0"] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python }} + python-version: ${{ matrix.python_version_major }}.${{ matrix.python_version_minor }} architecture: x64 - name: build oiio run: | @@ -45,15 +46,16 @@ jobs: export CXXFLAGS=-Werror=unused-variable cmake .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-variable" make VERBOSE=1 STOP_ON_WARNING=0 + make install shell: bash env: - OIIO_PYTHON_VERSION: ${{ matrix.python }} + OIIO_PYTHON_VERSION: ${{ matrix.python_version_major }}.${{ matrix.python_version_minor }} - name: Inject variable values into setup.py run: | cd src/python sed -i'' 's/PACKAGE_VERSION/${{ matrix.oiio_version }}/g' setup.py - sed -i'' 's/PYTHON_VERSION/${{ matrix.python }}/g' setup.py + sed -i'' 's/PYTHON_VERSION/${{ matrix.python_version_major }}.${{ matrix.python_version_minor }}/g' setup.py sed -i'' 's/OS_NAME/Microsoft :: POSIX :: Linux/g' setup.py cat setup.py - name: Copy files into oiio Python package @@ -64,13 +66,14 @@ jobs: mkdir ${GITHUB_WORKSPACE}/artifacts export DIST_DIR="${GITHUB_WORKSPACE}/artifacts" cd src/python - python3.7 -m pip install -U pip - pip3.7 install -U setuptools wheel - python3 setup.py bdist_wheel --python-tag=py37 --plat-name=linux_x86_64 --dist-dir="$DIST_DIR" + python${{ matrix.python_version_major }}.${{ matrix.python_version_minor }} -m pip install -U pip + pip${{ matrix.python_version_major }}.${{ matrix.python_version_minor }} install -U setuptools wheel auditwheel + python3 setup.py bdist_wheel --python-tag=cp${{ matrix.python_version_major }}${{ matrix.python_version_minor }} --plat-name=linux_x86_64 --dist-dir="$DIST_DIR" cd $DIST_DIR ls -lah - echo ::set-output name=asset-name::oiio-2.2.10.0-py37-none-linux_x86_64.whl - echo ::set-output name=asset-path::${GITHUB_WORKSPACE}/artifacts/oiio-2.2.10.0-py37-none-linux_x86_64.whl + auditwheel repair "oiio-${{ matrix.oiio_version }}-cp${{ matrix.python_version_major }}${{ matrix.python_version_minor }}-none-linux_x86_64.whl + echo ::set-output name=asset-name::oiio-${{ matrix.oiio_version }}-cp${{ matrix.python_version_major }}${{ matrix.python_version_minor }}-none-linux_x86_64.whl + echo ::set-output name=asset-path::${GITHUB_WORKSPACE}/artifacts/oiio-${{ matrix.oiio_version }}-cp${{ matrix.python_version_major }}${{ matrix.python_version_minor }}-none-linux_x86_64.whl - name: Generate Upload URL id: gen-upload-url run: | From 8532c208da6e7b4855d747f498adbffb171cfb89 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 13:35:12 -0800 Subject: [PATCH 30/47] Update build.yml --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3377fbc..07e30a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,6 +62,7 @@ jobs: run: | cp oiio/build/lib/python/site-packages/*.so src/python/oiio - name: Build wheel + id: build-wheel run: | mkdir ${GITHUB_WORKSPACE}/artifacts export DIST_DIR="${GITHUB_WORKSPACE}/artifacts" @@ -80,13 +81,13 @@ jobs: sudo apt-get install jq; RELEASE_ID=$(jq --raw-output '.release.id' $GITHUB_EVENT_PATH); echo ::set-output name=upload-url::https://uploads.github.com/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets - - name: Uplopad Release Asset + - name: Upload Release Asset id: upload-release-asset uses: actions/upload-release-asset@v1.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.gen-upload-url.outputs.upload-url }}?name=${{ steps.build-zip.outputs.asset-name }} - asset_path: ${{ steps.build-zip.outputs.asset-path }} - asset_name: ${{ steps.build-zip.outputs.asset-name }} + asset_path: ${{ steps.build-wheel.outputs.asset-path }} + asset_name: ${{ steps.build-wheel.outputs.asset-name }} asset_content_type: application/zip From 6b0026cfdbd667d8d89a91660edc26e3b577abb2 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 13:57:30 -0800 Subject: [PATCH 31/47] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07e30a2..03c4008 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: export CXXFLAGS=-Werror=unused-variable cmake .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-variable" make VERBOSE=1 STOP_ON_WARNING=0 - make install + sudo make install shell: bash env: OIIO_PYTHON_VERSION: ${{ matrix.python_version_major }}.${{ matrix.python_version_minor }} From 93103e2eea1a6233fee1d52baca83f929757491e Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 13:59:02 -0800 Subject: [PATCH 32/47] Update build.yml --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03c4008..70b8c61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,9 @@ # Build openimageio for python -on: +on: + pull_request: + branches: + - release release: types: [published] From f2f926e263ad70da8e85ad6169014cc2131d8b9b Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 9 Feb 2021 14:03:01 -0800 Subject: [PATCH 33/47] Update buildscripts to work with v2.2.10.0 --- .github/workflows/build.yml | 40 +++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70b8c61..1c94977 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,8 +45,6 @@ jobs: git checkout "v${{ matrix.oiio_version }}" mkdir build cd build - export CFLAGS=-Werror=unused-variable - export CXXFLAGS=-Werror=unused-variable cmake .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-variable" make VERBOSE=1 STOP_ON_WARNING=0 sudo make install @@ -61,23 +59,53 @@ jobs: sed -i'' 's/PYTHON_VERSION/${{ matrix.python_version_major }}.${{ matrix.python_version_minor }}/g' setup.py sed -i'' 's/OS_NAME/Microsoft :: POSIX :: Linux/g' setup.py cat setup.py + mkdir ${GITHUB_WORKSPACE}/artifacts - name: Copy files into oiio Python package run: | cp oiio/build/lib/python/site-packages/*.so src/python/oiio + # - name: Python wheels manylinux build + # uses: RalfG/python-wheels-manylinux-build@v0.3.3 + # with: + # python-versions: 'cp37-cp37m' + # package-path: 'src/python' + # pip-wheel-args: '-w /github/workspace/artifacts' + - name: Copy Files To Zip + run: | + SOURCE="oiio/build" + DEST="${GITHUB_WORKSPACE}/artifacts" + INSTALL_ROOT="/usr/local" + + if [ ! -d $DEST ]; then + mkdir $DEST + fi + + for file in $(find $SOURCE -type f ); do + echo "$file" + echo " ${file/$SOURCE/}" + src_file="${file/$SOURCE/}" + if [ -f $INSTALL_ROOT$src_file ]; then + cp $INSTALL_ROOT$src_file --parents $DEST + fi + done + - name: Build wheel id: build-wheel run: | - mkdir ${GITHUB_WORKSPACE}/artifacts export DIST_DIR="${GITHUB_WORKSPACE}/artifacts" cd src/python python${{ matrix.python_version_major }}.${{ matrix.python_version_minor }} -m pip install -U pip pip${{ matrix.python_version_major }}.${{ matrix.python_version_minor }} install -U setuptools wheel auditwheel python3 setup.py bdist_wheel --python-tag=cp${{ matrix.python_version_major }}${{ matrix.python_version_minor }} --plat-name=linux_x86_64 --dist-dir="$DIST_DIR" cd $DIST_DIR + echo "Dest Dir" + ls -lah + # echo "auditwheel" + # auditwheel repair "oiio-${{ matrix.oiio_version }}-py${{ matrix.python_version_major }}-none-any.whl" + # auditwheel repair "oiio-${{ matrix.oiio_version }}-cp${{ matrix.python_version_major }}${{ matrix.python_version_minor }}-none-linux_x86_64.whl" ls -lah - auditwheel repair "oiio-${{ matrix.oiio_version }}-cp${{ matrix.python_version_major }}${{ matrix.python_version_minor }}-none-linux_x86_64.whl - echo ::set-output name=asset-name::oiio-${{ matrix.oiio_version }}-cp${{ matrix.python_version_major }}${{ matrix.python_version_minor }}-none-linux_x86_64.whl - echo ::set-output name=asset-path::${GITHUB_WORKSPACE}/artifacts/oiio-${{ matrix.oiio_version }}-cp${{ matrix.python_version_major }}${{ matrix.python_version_minor }}-none-linux_x86_64.whl + zip -r "oiio-${{ matrix.oiio_version }}-py${{ matrix.python_version_major }}.zip" ./* + echo ::set-output name=asset-name::oiio-${{ matrix.oiio_version }}-py${{ matrix.python_version_major }}.zip + echo ::set-output name=asset-path::${GITHUB_WORKSPACE}/artifacts/oiio-${{ matrix.oiio_version }}-py${{ matrix.python_version_major }}.zip - name: Generate Upload URL id: gen-upload-url run: | From 0c61313ceb5d42360d0e0bb9efa0f9bc90e3e4a2 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Wed, 10 Feb 2021 09:28:40 -0800 Subject: [PATCH 34/47] Fix upload url --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c94977..24e1b00 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,7 +118,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ steps.gen-upload-url.outputs.upload-url }}?name=${{ steps.build-zip.outputs.asset-name }} + upload_url: ${{ steps.gen-upload-url.outputs.upload-url }}?name=${{ steps.build-wheel.outputs.asset-name }} asset_path: ${{ steps.build-wheel.outputs.asset-path }} asset_name: ${{ steps.build-wheel.outputs.asset-name }} asset_content_type: application/zip From b1e29fbea7a3031cf2afa3685db1fb56e17ea917 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Wed, 10 Feb 2021 12:43:15 -0800 Subject: [PATCH 35/47] Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 24e1b00..5ae35d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,7 @@ jobs: sudo apt-get install libtiff-dev sudo apt-get install libopenexr-dev sudo apt-get install libraw-dev + sudo apt-get install tree sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt-get update -y sudo apt-get install g++-7 -y @@ -78,6 +79,7 @@ jobs: if [ ! -d $DEST ]; then mkdir $DEST fi + tree oiio for file in $(find $SOURCE -type f ); do echo "$file" From 17202a03e99e6aa70a7eff204e5d3ba0df65c69e Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Wed, 10 Feb 2021 13:25:06 -0800 Subject: [PATCH 36/47] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ae35d6..9ef9d05 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,8 +47,8 @@ jobs: mkdir build cd build cmake .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-variable" - make VERBOSE=1 STOP_ON_WARNING=0 - sudo make install + make VERBOSE=1 STOP_ON_WARNING=0 LINKSTATIC=1 + sudo make install shell: bash env: OIIO_PYTHON_VERSION: ${{ matrix.python_version_major }}.${{ matrix.python_version_minor }} From 2b83cbc88d124b8c2f30cf81bc9840dbaf9b90e7 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Wed, 10 Feb 2021 16:05:36 -0800 Subject: [PATCH 37/47] Update build.yml --- .github/workflows/build.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ef9d05..9872ad2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,14 +80,16 @@ jobs: mkdir $DEST fi tree oiio - - for file in $(find $SOURCE -type f ); do - echo "$file" - echo " ${file/$SOURCE/}" - src_file="${file/$SOURCE/}" - if [ -f $INSTALL_ROOT$src_file ]; then - cp $INSTALL_ROOT$src_file --parents $DEST - fi + + for root in $SOURCE/bin $SOURCE/lib $SOURCE/include; do + for file in $(find $root -type f ); do + echo "$file" + echo " ${file/$SOURCE/}" + src_file="${file/$SOURCE/}" + if [ -f $INSTALL_ROOT$src_file ]; then + cp $INSTALL_ROOT$src_file --parents $DEST + fi + done done - name: Build wheel From b4ad834c69831cd5215702c2284d63076ce6352c Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Wed, 10 Feb 2021 16:27:27 -0800 Subject: [PATCH 38/47] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9872ad2..aba7963 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,6 +91,7 @@ jobs: fi done done + cp oiio/build/lib/python/site-packages/OpenImageIO.so $DEST/lib/python3.7/site-packages/OpenImageIO.so - name: Build wheel id: build-wheel From 31e3e530bad93e43048166338bd0cc28b9019ab7 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Wed, 10 Feb 2021 18:52:24 -0800 Subject: [PATCH 39/47] Update build.yml --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aba7963..c255301 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,15 +79,15 @@ jobs: if [ ! -d $DEST ]; then mkdir $DEST fi - tree oiio + # tree oiio for root in $SOURCE/bin $SOURCE/lib $SOURCE/include; do for file in $(find $root -type f ); do echo "$file" - echo " ${file/$SOURCE/}" src_file="${file/$SOURCE/}" - if [ -f $INSTALL_ROOT$src_file ]; then - cp $INSTALL_ROOT$src_file --parents $DEST + if [ -f $INSTALL_ROOT/$src_file ]; then + echo "$INSTALL_ROOT/$src_file -> $DEST" + cp $INSTALL_ROOT/$src_file --parents $DEST fi done done From 84a83311725837f60e432155c74db9a3e79ead54 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Thu, 11 Feb 2021 08:38:26 -0800 Subject: [PATCH 40/47] Update build.yml --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c255301..2e4c1af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,6 @@ jobs: sudo apt-get install libtiff-dev sudo apt-get install libopenexr-dev sudo apt-get install libraw-dev - sudo apt-get install tree sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt-get update -y sudo apt-get install g++-7 -y @@ -79,8 +78,7 @@ jobs: if [ ! -d $DEST ]; then mkdir $DEST fi - # tree oiio - + for root in $SOURCE/bin $SOURCE/lib $SOURCE/include; do for file in $(find $root -type f ); do echo "$file" From 49a89149f2042faaa6e138c007be76960d0ca001 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Thu, 11 Feb 2021 09:14:58 -0800 Subject: [PATCH 41/47] Update build.yml --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e4c1af..f892c76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,7 +89,12 @@ jobs: fi done done - cp oiio/build/lib/python/site-packages/OpenImageIO.so $DEST/lib/python3.7/site-packages/OpenImageIO.so + mkdir -p $DEST/lib/python3.7/site-packages + if [ -f $INSTALL_ROOT/lib/python3.7/site-packages/OpenImageIO.so ]; then + cp $INSTALL_ROOT/lib/python3.7/site-packages/OpenImageIO.so $DEST/lib/python3.7/site-packages/OpenImageIO.so + else + cp oiio/build/lib/python/site-packages/OpenImageIO.so $DEST/lib/python3.7/site-packages/OpenImageIO.so + fi - name: Build wheel id: build-wheel From f6b176d230cde2c50467a0d7afce94e0ce3b7a48 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Thu, 11 Feb 2021 16:33:30 -0800 Subject: [PATCH 42/47] Add files via upload --- build.sh | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 build.sh diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..0aecf07 --- /dev/null +++ b/build.sh @@ -0,0 +1,59 @@ +set -ex +OIIO_VERSION="2.2.11.1" + +sudo yum install -y libjpeg-turbo-devel zlib-devel libpng-devel libtiff-devel OpenEXR-devel LibRaw-devel cmake3 + + +# -I/usr/local/include/python3.7m -I/usr/local/include/python3.7m +# -lpython3.7m -lcrypt -lpthread -ldl -lutil -lm + +export CPLUS_INCLUDE_PATH="$CPLUS_INCLUDE_PATH:/usr/local/include/python3.7m" +export CPATH="$CPATH:/usr/include:/usr/local/include" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib:/usr/lib64:/usr/local/lib:/usr/local/lib64" +if [ ! -f boost_1_67_0.tar.gz ]; then + wget https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.gz +fi +if [ ! -d boost_1_67_0 ]; then + tar -xzf boost_1_* +fi +if [ ! -d /opt/boost ]; then + sudo mkdir /opt/boost + sud o chmod -R 777 /opt/boost +fi +cd boost_1_* +sudo ./bootstrap.sh --prefix=/opt/boost +sudo ./b2 install --prefix=/opt/boost --with=all -j4 +cd ../ + +# if [ -d oiio ]; then +# sudo rm -rf oiio; +# fi +if [ ! -d oiio ]; then + git clone https://github.com/OpenImageIO/oiio.git +fi +pip3.7 install pybind11[global] +pip3.7 install numpy + + +cd oiio +git checkout "v${OIIO_VERSION}" +if [ ! -d build ]; then + mkdir build +fi + + +bash src/build-scripts/gh-installdeps-centos.bash + +cd ../ +OPENEXR_CMAKE_FLAGS="-DCMAKE_NO_SYSTEM_FROM_IMPORTED:BOOL=TRUE" oiio/src/build-scripts/build_openexr.bash +export OpenEXR_ROOT="$(pwd)/ext/dist" +echo "OpenEXR_ROOT=${OpenEXR_ROOT}" +cd oiio + +sleep 2 +echo "Executing cmake" +cd build && cmake3 .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-variable" -DVERBOSE=1 -DSTOP_ON_WARNING=0 -DBoost_ROOT="/opt/boost" -DOIIO_BUILD_TESTS=0 -DOpenEXR_ROOT="${OpenEXR_ROOT}" -DCMAKE_NO_SYSTEM_FROM_IMPORTED:BOOL="TRUE" -DCMAKE_INSTALL_PREFIX="${OpenEXR_ROOT}" +sleep 2 +echo "Make install" +sudo make install + From a6d2b280de75cdc1ccc6cf9cdc180991b0188d5e Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Tue, 5 Dec 2023 16:36:36 -0800 Subject: [PATCH 43/47] Update build.sh --- build.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 0aecf07..c15f161 100644 --- a/build.sh +++ b/build.sh @@ -2,14 +2,20 @@ set -ex OIIO_VERSION="2.2.11.1" sudo yum install -y libjpeg-turbo-devel zlib-devel libpng-devel libtiff-devel OpenEXR-devel LibRaw-devel cmake3 +curl https://pyenv.run | bash +echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc +echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc +echo 'eval "$(pyenv init -)"' >> ~/.bashrc +pyenv install 3.10.13 +pyenv global 3.10.13 -# -I/usr/local/include/python3.7m -I/usr/local/include/python3.7m +# -I/usr/local/include/python3.10m -I/usr/local/include/python3.10m # -lpython3.7m -lcrypt -lpthread -ldl -lutil -lm -export CPLUS_INCLUDE_PATH="$CPLUS_INCLUDE_PATH:/usr/local/include/python3.7m" -export CPATH="$CPATH:/usr/include:/usr/local/include" -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib:/usr/lib64:/usr/local/lib:/usr/local/lib64" +export CPLUS_INCLUDE_PATH="$HOME/.pyenv/versions/3.10.13/include/python3.10:$CPLUS_INCLUDE_PATH" +export CPATH="$HOME/.pyenv/versions/3.10.13/include:$CPATH:/usr/include:/usr/local/include" +export LD_LIBRARY_PATH="$HOME/.pyenv/versions/3.10.13/lib:$LD_LIBRARY_PATH:/usr/lib:/usr/lib64:/usr/local/lib:/usr/local/lib64" if [ ! -f boost_1_67_0.tar.gz ]; then wget https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.gz fi @@ -31,8 +37,9 @@ cd ../ if [ ! -d oiio ]; then git clone https://github.com/OpenImageIO/oiio.git fi -pip3.7 install pybind11[global] -pip3.7 install numpy +pip3.10 install pybind11[global] +pip3.10 +install numpy cd oiio From 315cc949f77eabf91020f46f8aaa394586156459 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Wed, 6 Dec 2023 10:31:55 -0800 Subject: [PATCH 44/47] Update build.sh --- build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index c15f161..1a5d5dd 100644 --- a/build.sh +++ b/build.sh @@ -1,11 +1,14 @@ set -ex OIIO_VERSION="2.2.11.1" -sudo yum install -y libjpeg-turbo-devel zlib-devel libpng-devel libtiff-devel OpenEXR-devel LibRaw-devel cmake3 +sudo dnf install -y libjpeg-turbo-devel zlib-devel libpng-devel libtiff-devel OpenEXR-devel LibRaw-devel cmake3 make gcc patch zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel tk-devel libffi-devel xz-devel libuuid-devel gdbm-libs libnsl2 curl https://pyenv.run | bash echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc echo 'eval "$(pyenv init -)"' >> ~/.bashrc +export PYENV_ROOT="$HOME/.pyenv" +command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init -)" pyenv install 3.10.13 pyenv global 3.10.13 From 178c179e1f3a9a567e8d5ebe5396bf5f4186d29f Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Wed, 6 Dec 2023 14:48:10 -0800 Subject: [PATCH 45/47] Update build.sh --- build.sh | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/build.sh b/build.sh index 1a5d5dd..50e6cc0 100644 --- a/build.sh +++ b/build.sh @@ -2,17 +2,20 @@ set -ex OIIO_VERSION="2.2.11.1" sudo dnf install -y libjpeg-turbo-devel zlib-devel libpng-devel libtiff-devel OpenEXR-devel LibRaw-devel cmake3 make gcc patch zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel tk-devel libffi-devel xz-devel libuuid-devel gdbm-libs libnsl2 -curl https://pyenv.run | bash -echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc -echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc -echo 'eval "$(pyenv init -)"' >> ~/.bashrc -export PYENV_ROOT="$HOME/.pyenv" -command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init -)" -pyenv install 3.10.13 +sudo dnf groupinstall "Development Tools" -y +if ! command -v pyenv &> /dev/null +then + curl https://pyenv.run | bash + echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc + echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc + echo 'eval "$(pyenv init -)"' >> ~/.bashrc + export PYENV_ROOT="$HOME/.pyenv" + command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" + eval "$(pyenv init -)" +fi +pyenv install 3.10.13 --skip-existing pyenv global 3.10.13 - # -I/usr/local/include/python3.10m -I/usr/local/include/python3.10m # -lpython3.7m -lcrypt -lpthread -ldl -lutil -lm @@ -20,16 +23,17 @@ export CPLUS_INCLUDE_PATH="$HOME/.pyenv/versions/3.10.13/include/python3.10:$CPL export CPATH="$HOME/.pyenv/versions/3.10.13/include:$CPATH:/usr/include:/usr/local/include" export LD_LIBRARY_PATH="$HOME/.pyenv/versions/3.10.13/lib:$LD_LIBRARY_PATH:/usr/lib:/usr/lib64:/usr/local/lib:/usr/local/lib64" if [ ! -f boost_1_67_0.tar.gz ]; then - wget https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.gz + wget https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.gz fi if [ ! -d boost_1_67_0 ]; then tar -xzf boost_1_* fi if [ ! -d /opt/boost ]; then - sudo mkdir /opt/boost - sud o chmod -R 777 /opt/boost + sudo mkdir /opt/boost + sudo chmod -R 777 /opt/boost fi -cd boost_1_* + +cd boost_1_67_0 sudo ./bootstrap.sh --prefix=/opt/boost sudo ./b2 install --prefix=/opt/boost --with=all -j4 cd ../ @@ -41,8 +45,7 @@ if [ ! -d oiio ]; then git clone https://github.com/OpenImageIO/oiio.git fi pip3.10 install pybind11[global] -pip3.10 -install numpy +pip3.10 install numpy cd oiio From fcd49d13f0e565e3669c784684dd91237356b969 Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Wed, 6 Dec 2023 14:50:18 -0800 Subject: [PATCH 46/47] Update for rhel9 and add support for latest OIIO --- build.sh | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/build.sh b/build.sh index 50e6cc0..bded3d7 100644 --- a/build.sh +++ b/build.sh @@ -1,5 +1,6 @@ set -ex OIIO_VERSION="2.2.11.1" +OIIO_VERSION="2.5.6.0" sudo dnf install -y libjpeg-turbo-devel zlib-devel libpng-devel libtiff-devel OpenEXR-devel LibRaw-devel cmake3 make gcc patch zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel tk-devel libffi-devel xz-devel libuuid-devel gdbm-libs libnsl2 sudo dnf groupinstall "Development Tools" -y @@ -16,6 +17,8 @@ fi pyenv install 3.10.13 --skip-existing pyenv global 3.10.13 +Python_ROOT="$(pyenv root)/versions/$(pyenv version-name)" + # -I/usr/local/include/python3.10m -I/usr/local/include/python3.10m # -lpython3.7m -lcrypt -lpthread -ldl -lutil -lm @@ -24,15 +27,15 @@ export CPATH="$HOME/.pyenv/versions/3.10.13/include:$CPATH:/usr/include:/usr/loc export LD_LIBRARY_PATH="$HOME/.pyenv/versions/3.10.13/lib:$LD_LIBRARY_PATH:/usr/lib:/usr/lib64:/usr/local/lib:/usr/local/lib64" if [ ! -f boost_1_67_0.tar.gz ]; then wget https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.gz + # wget https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.gz fi if [ ! -d boost_1_67_0 ]; then tar -xzf boost_1_* fi if [ ! -d /opt/boost ]; then - sudo mkdir /opt/boost - sudo chmod -R 777 /opt/boost + sudo mkdir /opt/boost + sudo chmod -R 777 /opt/boost fi - cd boost_1_67_0 sudo ./bootstrap.sh --prefix=/opt/boost sudo ./b2 install --prefix=/opt/boost --with=all -j4 @@ -54,19 +57,25 @@ if [ ! -d build ]; then mkdir build fi - -bash src/build-scripts/gh-installdeps-centos.bash +export ASWF_ORG="Fake" +export GITHUB_ENV="$(pwd)/github.env" +bash src/build-scripts/gh-installdeps.bash cd ../ +bash oiio/src/build-scripts/build_libjpeg-turbo.bash +export LibJpegTurbo_ROOT="$(pwd)/ext/dist" + OPENEXR_CMAKE_FLAGS="-DCMAKE_NO_SYSTEM_FROM_IMPORTED:BOOL=TRUE" oiio/src/build-scripts/build_openexr.bash export OpenEXR_ROOT="$(pwd)/ext/dist" echo "OpenEXR_ROOT=${OpenEXR_ROOT}" +export IlmBase_ROOT="$(pwd)/ext/dist" cd oiio + + sleep 2 echo "Executing cmake" -cd build && cmake3 .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-variable" -DVERBOSE=1 -DSTOP_ON_WARNING=0 -DBoost_ROOT="/opt/boost" -DOIIO_BUILD_TESTS=0 -DOpenEXR_ROOT="${OpenEXR_ROOT}" -DCMAKE_NO_SYSTEM_FROM_IMPORTED:BOOL="TRUE" -DCMAKE_INSTALL_PREFIX="${OpenEXR_ROOT}" +cd build && cmake3 .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-variable" -DVERBOSE=1 -DSTOP_ON_WARNING=0 -DBoost_ROOT="/opt/boost" -DOIIO_BUILD_TESTS=0 -DOpenEXR_ROOT="${OpenEXR_ROOT}" -DCMAKE_NO_SYSTEM_FROM_IMPORTED:BOOL="TRUE" -DCMAKE_INSTALL_PREFIX="${OpenEXR_ROOT}"i -DIlmBase_ROOT="${IlmBase_ROOT}" -Dlibjpeg-turbo_ROOT="${LibJpegTurbo_ROOT}" -DPython_ROOT="${Python_ROOT}" -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES="${Python_ROOT}/include/python3.10" sleep 2 echo "Make install" sudo make install - From 5231bbd156c94b8d79b5ea5eb02ec845bd36d77a Mon Sep 17 00:00:00 2001 From: Alex Hughes Date: Fri, 8 Dec 2023 16:55:22 -0800 Subject: [PATCH 47/47] Update build.sh --- build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.sh b/build.sh index bded3d7..676989a 100644 --- a/build.sh +++ b/build.sh @@ -79,3 +79,11 @@ cd build && cmake3 .. -DCMAKE_CXX_FLAGS="-Wno-error=unused-variable" -DVERBOSE= sleep 2 echo "Make install" sudo make install + + +cd ../ +mkdir -p usr/local +cp -R ext/dist/bin ext/dist/include ext/dist/lib ext/dist/share ext/dist/lib64 /opt/boost/lib /opt/boost/include ext/disti/bin ext/disti/lib64 ext/disti/include ext/disti/share ${Python_ROOT}/bin ${Python_ROOT}/lib ${Python_ROOT}/share ${Python_ROOT}/include usr/local/ + +find usr \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s|${Python_ROOT}|/usr/local|g" +tar -czvf oiio-2.5.6.0-openexr-3.1.9-boost-1.67.0-python3.9.tar.gz usr/