Skip to content

Commit 71d8e32

Browse files
cary-ilmcary-ilm
committed
fix9
Signed-off-by: Cary Phillips <cary@ilm.com>
1 parent 6d22fd0 commit 71d8e32

5 files changed

Lines changed: 138 additions & 5 deletions

File tree

‎.github/workflows/ci_steps.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,17 @@ jobs:
208208
cmake ${{ env.CMAKE_ARGS }}
209209
cmake --build . --target install --config ${{ inputs.build-type }}
210210
if [ "${{ inputs.BUILD_TESTING }}" == "ON" ]; then
211-
echo ctest -T Test -C ${{ inputs.build-type }} --timeout 7200 --output-on-failure -VV
211+
ctest -T Test -C ${{ inputs.build-type }} --timeout 7200 --output-on-failure -VV
212212
fi
213213
working-directory: _build
214214
shell: msys2 {0}
215215

216+
- name: Test
217+
if: inputs.BUILD_TESTING == 'ON'
218+
run: |
219+
ctest -T Test -C ${{ inputs.build-type }} --timeout 7200 --output-on-failure -VV
220+
working-directory: _build
221+
216222
- name: Test Pybind11
217223
if: inputs.pybind11 == 'ON'
218224
run: python -v src/pybind11/PyBindImathTest/test_import_pybindimath.py

‎share/ci/install_manifest/install_manifest.macos.5.txt‎

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# cmake -B . -S .. -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DIMATH_INSTALL_PKG_CONFIG=ON -DBUILD_TESTING=ON -DPYTHON=OFF -DPYBIND11=OFF -DCMAKE_VERBOSE_MAKEFILE=ON
1+
# cmake -B . -S .. -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DIMATH_INSTALL_PKG_CONFIG=ON -DBUILD_TESTING=ON -DPYTHON=ON -DPYBIND11=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DPython3_EXECUTABLE=/Library/Frameworks/Python.framework/Versions/Current/bin/python -DPYTHON_INSTALL_DIR=/Users/runner/work/Imath/Imath/_install/python -Dpybind11_DIR=/Library/Frameworks/Python.framework/Versions/3.13/lib/python3.13/site-packages/pybind11/share/cmake/pybind11 -DBoost_ROOT=/Users/runner/work/Imath/Imath/_conan -DCMAKE_TOOLCHAIN_FILE=/Users/runner/work/Imath/Imath/_conan/conan_toolchain.cmake
22
include/Imath/ImathBox.h
33
include/Imath/ImathBoxAlgo.h
44
include/Imath/ImathColor.h
@@ -34,12 +34,74 @@ include/Imath/ImathVecAlgo.h
3434
include/Imath/half.h
3535
include/Imath/halfFunction.h
3636
include/Imath/halfLimits.h
37+
include/PyBindImath_Python3_13-$MAJOR_$MINOR/PyBindImath.h
38+
include/PyBindImath_Python3_13-$MAJOR_$MINOR/PyBindImathExport.h
39+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImath.h
40+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathAPI.h
41+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathAutovectorize.h
42+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathBasicTypes.h
43+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathBox.h
44+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathBoxArrayImpl.h
45+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathBufferProtocol.h
46+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathColor.h
47+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathColor3ArrayImpl.h
48+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathColor4Array2DImpl.h
49+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathColor4ArrayImpl.h
50+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathDecorators.h
51+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathEuler.h
52+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathExport.h
53+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathFixedArray.h
54+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathFixedArray2D.h
55+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathFixedArrayTraits.h
56+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathFixedMatrix.h
57+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathFixedVArray.h
58+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathFrustum.h
59+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathFun.h
60+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathLine.h
61+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathMathExc.h
62+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathMatrix.h
63+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathOperators.h
64+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathPlane.h
65+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathQuat.h
66+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathQuatOperators.h
67+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathRandom.h
68+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathShear.h
69+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathStringArray.h
70+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathStringArrayRegister.h
71+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathStringTable.h
72+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathTask.h
73+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathUtil.h
74+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathVec.h
75+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathVec2Impl.h
76+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathVec3ArrayImpl.h
77+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathVec3Impl.h
78+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathVec4ArrayImpl.h
79+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathVec4Impl.h
80+
include/PyImath_Python3_13-$MAJOR_$MINOR/PyImathVecOperators.h
3781
lib/cmake/Imath/ImathConfig.cmake
3882
lib/cmake/Imath/ImathConfigVersion.cmake
3983
lib/cmake/Imath/ImathTargets-release.cmake
4084
lib/cmake/Imath/ImathTargets.cmake
85+
lib/cmake/PyBindImath_Python3_13-$MAJOR_$MINOR/PyBindImath_Python3_13-$MAJOR_$MINORConfigVersion.cmake
86+
lib/cmake/PyBindImath_Python3_13-$MAJOR_$MINOR/PyBindImath_Python3_13-$MAJOR_$MINORTargets-release.cmake
87+
lib/cmake/PyBindImath_Python3_13-$MAJOR_$MINOR/PyBindImath_Python3_13-$MAJOR_$MINORTargets.cmake
88+
lib/cmake/PyImath_Python3_13-$MAJOR_$MINOR/PyImath_Python3_13-$MAJOR_$MINORConfigVersion.cmake
89+
lib/cmake/PyImath_Python3_13-$MAJOR_$MINOR/PyImath_Python3_13-$MAJOR_$MINORTargets-release.cmake
90+
lib/cmake/PyImath_Python3_13-$MAJOR_$MINOR/PyImath_Python3_13-$MAJOR_$MINORTargets.cmake
4191
lib/libImath-$MAJOR_$MINOR.$SOVERSION.$MAJOR.$MINOR.$PATCH.dylib
4292
lib/libImath-$MAJOR_$MINOR.$SOVERSION.dylib
4393
lib/libImath-$MAJOR_$MINOR.dylib
4494
lib/libImath.dylib
95+
lib/libPyBindImath_Python3_13-$MAJOR_$MINOR.$SOVERSION.$MAJOR.$MINOR.$PATCH.dylib
96+
lib/libPyBindImath_Python3_13-$MAJOR_$MINOR.$SOVERSION.dylib
97+
lib/libPyBindImath_Python3_13-$MAJOR_$MINOR.dylib
98+
lib/libPyBindImath_Python3_13-$MAJOR_$MINOR.dylib
99+
lib/libPyImath_Python3_13-$MAJOR_$MINOR.$SOVERSION.$MAJOR.$MINOR.$PATCH.dylib
100+
lib/libPyImath_Python3_13-$MAJOR_$MINOR.$SOVERSION.dylib
101+
lib/libPyImath_Python3_13-$MAJOR_$MINOR.dylib
45102
lib/pkgconfig/Imath.pc
103+
lib/pkgconfig/PyBindImath.pc
104+
lib/pkgconfig/PyImath.pc
105+
python/imath.so
106+
python/imathnumpy.so
107+
python/pybindimath.cpython-313-darwin.so

‎src/pybind11/PyBindImathTest/pyBindImathTest‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,30 @@
55
# Copyright Contributors to the OpenEXR Project.
66
#
77

8+
import os
9+
import sys
10+
from pathlib import Path
11+
12+
print(f"{__file__}: PYTHONPATH={os.environ['PYTHONPATH']}")
13+
pythonpath = os.environ.get('PYTHONPATH')
14+
if pythonpath:
15+
# Use os.pathsep which is ':' on Unix/macOS and ';' on Windows
16+
paths = pythonpath.split(os.pathsep)
17+
for path in paths:
18+
if not path:
19+
continue
20+
resolved_path = Path(path).expanduser().resolve()
21+
print(f"Contents of: {resolved_path}")
22+
if resolved_path.is_dir():
23+
for root, dirs, files in os.walk(resolved_path):
24+
for f in files:
25+
file_path = Path(root) / f
26+
print(f" {file_path}")
27+
else:
28+
print(f" [Not a directory or does not exist]")
29+
print()
30+
831
from pybindimath import *
9-
#from imath import *
1032
from math import sqrt, pi, sin, cos
1133
import math
1234
import string, traceback, sys

‎src/python/PyImathNumpyTest/pyImathNumpyTest.in‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,29 @@
55
# Copyright Contributors to the OpenEXR Project.
66
#
77

8+
import os
9+
import sys
10+
from pathlib import Path
11+
12+
print(f"{__file__}: PYTHONPATH={os.environ['PYTHONPATH']}")
13+
pythonpath = os.environ.get('PYTHONPATH')
14+
if pythonpath:
15+
# Use os.pathsep which is ':' on Unix/macOS and ';' on Windows
16+
paths = pythonpath.split(os.pathsep)
17+
for path in paths:
18+
if not path:
19+
continue
20+
resolved_path = Path(path).expanduser().resolve()
21+
print(f"Contents of: {resolved_path}")
22+
if resolved_path.is_dir():
23+
for root, dirs, files in os.walk(resolved_path):
24+
for f in files:
25+
file_path = Path(root) / f
26+
print(f" {file_path}")
27+
else:
28+
print(f" [Not a directory or does not exist]")
29+
print()
30+
831
from imath import *
932

1033
import imathnumpy

‎src/python/PyImathTest/pyImathTest.in‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,32 @@
66
#
77

88
import os
9-
print(f"os.environ[PYTHONPATH]: ${os.environ['PYTHONPATH']}")
9+
import sys
10+
from pathlib import Path
11+
12+
print(f"{__file__}: PYTHONPATH={os.environ['PYTHONPATH']}")
13+
pythonpath = os.environ.get('PYTHONPATH')
14+
if pythonpath:
15+
# Use os.pathsep which is ':' on Unix/macOS and ';' on Windows
16+
paths = pythonpath.split(os.pathsep)
17+
for path in paths:
18+
if not path:
19+
continue
20+
resolved_path = Path(path).expanduser().resolve()
21+
print(f"Contents of: {resolved_path}")
22+
if resolved_path.is_dir():
23+
for root, dirs, files in os.walk(resolved_path):
24+
for f in files:
25+
file_path = Path(root) / f
26+
print(f" {file_path}")
27+
else:
28+
print(f" [Not a directory or does not exist]")
29+
print()
1030

1131
from imath import *
1232
from math import sqrt, pi, sin, cos
1333
import math
14-
import string, traceback, sys
34+
import string, traceback
1535
import random
1636

1737
testList = []

0 commit comments

Comments
 (0)