Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI : Update to GafferHQ/dependencies 7.0.0 #1380

Merged
merged 5 commits into from
Jul 25, 2023
Merged

CI : Update to GafferHQ/dependencies 7.0.0 #1380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e47d360
Tests : Don't include `boost/test/floating_point_comparison.hpp`
johnhaddon Jul 24, 2023
9bd2351
LevenbergMarquardtTest : Replace `boost::array` with regular array
johnhaddon Jul 24, 2023
f64c293
Tests : Adapt for OpenEXR/Imath 3
johnhaddon Jul 24, 2023
dd1fa74
CI : Update to GafferHQ/dependencies 7.0.0
johnhaddon Jul 21, 2023
9ec93a6
Imath test : Relax assertion
johnhaddon Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
buildType: RELEASE
containerImage: ghcr.io/gafferhq/build/build:2.0.0
options: .github/workflows/main/options.posix
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-linux.tar.gz
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/7.0.0/gafferDependencies-7.0.0-linux.tar.gz
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
publish: true

Expand All @@ -52,23 +52,23 @@ jobs:
buildType: DEBUG
containerImage: ghcr.io/gafferhq/build/build:2.0.0
options: .github/workflows/main/options.posix
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-linux.tar.gz
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/7.0.0/gafferDependencies-7.0.0-linux.tar.gz
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
publish: false

- name: windows-python3
os: windows-2019
buildType: RELEASE
options: .github/workflows/main/options.windows
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-windows.zip
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/7.0.0/gafferDependencies-7.0.0-windows.zip
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
publish: true

- name: windows-python3-debug
os: windows-2019
buildType: RELWITHDEBINFO
options: .github/workflows/main/options.windows
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-windows.zip
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/7.0.0/gafferDependencies-7.0.0-windows.zip
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
publish: false

Expand Down
10 changes: 8 additions & 2 deletions test/IECore/CompilerTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,17 @@
#include "IECore/Export.h"

IECORE_PUSH_DEFAULT_VISIBILITY
#include "OpenEXR/OpenEXRConfig.h"
#if OPENEXR_VERSION_MAJOR < 3
#include "OpenEXR/ImathBox.h"
#include "OpenEXR/ImathVec.h"
IECORE_POP_DEFAULT_VISIBILITY

#include "OpenEXR/ImathLineAlgo.h"
#else
#include "Imath/ImathBox.h"
#include "Imath/ImathVec.h"
#include "Imath/ImathLineAlgo.h"
#endif
IECORE_POP_DEFAULT_VISIBILITY

IECORE_PUSH_DEFAULT_VISIBILITY
#include "boost/test/unit_test.hpp"
Expand Down
1 change: 0 additions & 1 deletion test/IECore/DataConversionTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ IECORE_PUSH_DEFAULT_VISIBILITY
IECORE_POP_DEFAULT_VISIBILITY

#include "boost/random.hpp"
#include "boost/test/floating_point_comparison.hpp"

#include <cassert>

Expand Down
2 changes: 0 additions & 2 deletions test/IECore/DataConvertTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ IECORE_PUSH_DEFAULT_VISIBILITY
#include "boost/test/unit_test.hpp"
IECORE_POP_DEFAULT_VISIBILITY

#include "boost/test/floating_point_comparison.hpp"

#include <cassert>

namespace IECore
Expand Down
2 changes: 0 additions & 2 deletions test/IECore/DespatchTypedDataTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ IECORE_PUSH_DEFAULT_VISIBILITY
#include "boost/test/unit_test.hpp"
IECORE_POP_DEFAULT_VISIBILITY

#include "boost/test/floating_point_comparison.hpp"

#include <cassert>

using namespace Imath;
Expand Down
5 changes: 5 additions & 0 deletions test/IECore/IECoreTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,12 @@
#include "IECore/Export.h"

IECORE_PUSH_DEFAULT_VISIBILITY
#include "OpenEXR/OpenEXRConfig.h"
#if OPENEXR_VERSION_MAJOR < 3
#include "OpenEXR/ImathColor.h"
#else
#include "Imath/ImathColor.h"
#endif
IECORE_POP_DEFAULT_VISIBILITY

#include <iostream>
Expand Down
10 changes: 5 additions & 5 deletions test/IECore/Imath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ def testConstructors(self):
self.assertEqual(v.x, 1)
self.assertEqual(v.y, 1)

self.assertRaises( RuntimeError, imath.V2f, [ 1 ] )
self.assertRaises( RuntimeError, imath.V2f, [ 1, 2, 3 ] )
self.assertRaises( Exception, imath.V2f, [ 1 ] )
self.assertRaises( Exception, imath.V2f, [ 1, 2, 3 ] )

def testDimensions(self):
"""Test V2f dimensions"""
Expand Down Expand Up @@ -291,9 +291,9 @@ def testConstructors(self):
self.assertEqual(v.y, 1)
self.assertEqual(v.z, 1)

self.assertRaises( RuntimeError, imath.V3f, [ 1 ] )
self.assertRaises( RuntimeError, imath.V3f, [ 1, 2 ] )
self.assertRaises( RuntimeError, imath.V3f, [ 1, 2, 3, 4 ] )
self.assertRaises( Exception, imath.V3f, [ 1 ] )
self.assertRaises( Exception, imath.V3f, [ 1, 2 ] )
self.assertRaises( Exception, imath.V3f, [ 1, 2, 3, 4 ] )

def testDimensions(self):
"""Test V3f dimensions"""
Expand Down
2 changes: 0 additions & 2 deletions test/IECore/IndexedIOTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ IECORE_PUSH_DEFAULT_VISIBILITY
#include "boost/test/unit_test.hpp"
IECORE_POP_DEFAULT_VISIBILITY

#include "boost/test/floating_point_comparison.hpp"

#include <cassert>
#include <iostream>
#include <string>
Expand Down
5 changes: 5 additions & 0 deletions test/IECore/InternedStringTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@

#include "IECore/InternedString.h"

#include "OpenEXR/OpenEXRConfig.h"
#if OPENEXR_VERSION_MAJOR < 3
#include "OpenEXR/ImathRandom.h"
#else
#include "Imath/ImathRandom.h"
#endif

#include "boost/lexical_cast.hpp"

Expand Down
11 changes: 8 additions & 3 deletions test/IECore/InterpolatorTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,23 @@
#include "IECore/Interpolator.h"

IECORE_PUSH_DEFAULT_VISIBILITY
#include "OpenEXR/OpenEXRConfig.h"
#if OPENEXR_VERSION_MAJOR < 3
#include "OpenEXR/ImathMatrix.h"
#include "OpenEXR/ImathMatrixAlgo.h"
#include "OpenEXR/ImathVec.h"
#else
#include "Imath/ImathMatrix.h"
#include "Imath/ImathMatrixAlgo.h"
#include "Imath/ImathVec.h"
#endif
IECORE_POP_DEFAULT_VISIBILITY

#include "OpenEXR/ImathMatrixAlgo.h"

IECORE_PUSH_DEFAULT_VISIBILITY
#include "boost/test/unit_test.hpp"
IECORE_POP_DEFAULT_VISIBILITY

#include "boost/test/floating_point_comparison.hpp"

namespace IECore
{
void addInterpolatorTest(boost::unit_test::test_suite* test);
Expand Down
9 changes: 7 additions & 2 deletions test/IECore/KDTreeTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,15 @@
#include "IECore/KDTree.h"

IECORE_PUSH_DEFAULT_VISIBILITY
#include "OpenEXR/OpenEXRConfig.h"
#if OPENEXR_VERSION_MAJOR < 3
#include "OpenEXR/ImathVec.h"
IECORE_POP_DEFAULT_VISIBILITY

#include "OpenEXR/ImathRandom.h"
#else
#include "Imath/ImathVec.h"
#include "Imath/ImathRandom.h"
#endif
IECORE_POP_DEFAULT_VISIBILITY

IECORE_PUSH_DEFAULT_VISIBILITY
#include "boost/test/unit_test.hpp"
Expand Down
9 changes: 7 additions & 2 deletions test/IECore/LevenbergMarquardtTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,16 @@
#include "IECore/LevenbergMarquardt.h"

IECORE_PUSH_DEFAULT_VISIBILITY
#include "OpenEXR/OpenEXRConfig.h"
#if OPENEXR_VERSION_MAJOR < 3
#include "OpenEXR/ImathRandom.h"
#include "OpenEXR/ImathVec.h"
#else
#include "Imath/ImathRandom.h"
#include "Imath/ImathVec.h"
#endif
IECORE_POP_DEFAULT_VISIBILITY

#include "OpenEXR/ImathRandom.h"

IECORE_PUSH_DEFAULT_VISIBILITY
#include "boost/test/unit_test.hpp"
IECORE_POP_DEFAULT_VISIBILITY
Expand Down
12 changes: 4 additions & 8 deletions test/IECore/LevenbergMarquardtTest.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////

#include "OpenEXR/ImathMath.h"
#include "OpenEXR/ImathRandom.h"

#include "boost/math/tools/rational.hpp"
#include "boost/test/floating_point_comparison.hpp"

using namespace IECore;
using namespace Imath;
Expand All @@ -63,7 +59,7 @@ class LevenbergMarquardtTestSimple<T>::Fn
for ( unsigned i = 1; i <= m_num; i ++ )
{
/// Distance between our guess and the real function
errors->writable()[i-1] = Imath::Math<T>::fabs(
errors->writable()[i-1] = std::abs(
parameters->readable()[i-1] -
i * i
);
Expand Down Expand Up @@ -137,7 +133,7 @@ class LevenbergMarquardtTestPolynomialFit<T>::Fn
)
{

boost::array<T, N> testCoeffs;
T testCoeffs[N];
for ( unsigned i = 0; i < N; i ++ )
{
testCoeffs[i] = parameters->readable()[i];
Expand All @@ -150,7 +146,7 @@ class LevenbergMarquardtTestPolynomialFit<T>::Fn
T v2 = boost::math::tools::evaluate_polynomial<N, T, T>( m_coeffs, (T(i) / m_num - 0.5) * 10.0);

/// Distance between our guess and the real function
errors->writable()[i] = Imath::Math<T>::fabs( v1 - v2 );
errors->writable()[i] = std::abs( v1 - v2 );
}
}

Expand All @@ -171,7 +167,7 @@ class LevenbergMarquardtTestPolynomialFit<T>::Fn
protected :

unsigned m_num;
boost::array<T, N> m_coeffs;
T m_coeffs[N];
};

template<typename T>
Expand Down
5 changes: 5 additions & 0 deletions test/IECore/ParameterThreadingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@
#include "IECore/TypedObjectParameter.h"
#include "IECore/VectorTypedParameter.h"

#include "OpenEXR/OpenEXRConfig.h"
#if OPENEXR_VERSION_MAJOR < 3
#include "OpenEXR/ImathRandom.h"
#else
#include "Imath/ImathRandom.h"
#endif

#include "tbb/parallel_for.h"

Expand Down
1 change: 0 additions & 1 deletion test/IECore/RadixSortTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ IECORE_PUSH_DEFAULT_VISIBILITY
IECORE_POP_DEFAULT_VISIBILITY

#include "boost/random.hpp"
#include "boost/test/floating_point_comparison.hpp"

#include <cassert>
#include <iostream>
Expand Down
10 changes: 7 additions & 3 deletions test/IECore/SpaceTransformTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,21 @@
#include "IECore/SphericalToEuclideanTransform.h"

IECORE_PUSH_DEFAULT_VISIBILITY
#include "OpenEXR/OpenEXRConfig.h"
#if OPENEXR_VERSION_MAJOR < 3
#include "OpenEXR/ImathVec.h"
#include "OpenEXR/ImathRandom.h"
#else
#include "Imath/ImathVec.h"
#include "Imath/ImathRandom.h"
#endif
IECORE_POP_DEFAULT_VISIBILITY

#include "OpenEXR/ImathRandom.h"

IECORE_PUSH_DEFAULT_VISIBILITY
#include "boost/test/unit_test.hpp"
IECORE_POP_DEFAULT_VISIBILITY

#include "boost/test/floating_point_comparison.hpp"

#include <cassert>

#include <limits.h>
Expand Down
7 changes: 6 additions & 1 deletion test/IECore/SweepAndPruneTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,21 @@
#include "IECore/VectorTraits.h"

IECORE_PUSH_DEFAULT_VISIBILITY
#include "OpenEXR/OpenEXRConfig.h"
#if OPENEXR_VERSION_MAJOR < 3
#include "OpenEXR/ImathBox.h"
#include "OpenEXR/ImathVec.h"
#else
#include "Imath/ImathBox.h"
#include "Imath/ImathVec.h"
#endif
IECORE_POP_DEFAULT_VISIBILITY

IECORE_PUSH_DEFAULT_VISIBILITY
#include "boost/test/unit_test.hpp"
IECORE_POP_DEFAULT_VISIBILITY

#include "boost/random.hpp"
#include "boost/test/floating_point_comparison.hpp"

#include <cassert>
#include <iostream>
Expand Down
4 changes: 4 additions & 0 deletions test/IECore/TypedDataTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@
#include "IECore/SimpleTypedData.h"
#include "IECore/VectorTypedData.h"

#if OPENEXR_VERSION_MAJOR < 3
#include "OpenEXR/ImathRandom.h"
#else
#include "Imath/ImathRandom.h"
#endif

IECORE_PUSH_DEFAULT_VISIBILITY
#include "boost/test/unit_test.hpp"
Expand Down
Loading