Skip to content

Move GPU LUT files into the tests dir #2069

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

Merged
doug-walker merged 1 commit into from
Oct 18, 2024
Merged

Move GPU LUT files into the tests dir #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tests/cpu/Context_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ OCIO_ADD_TEST(Context, use_searchpaths)
const std::string res1 = searchPath1 + "/Context.cpp";
OCIO_CHECK_ASSERT(strcmp(SanitizePath(resolvedSource.c_str()).c_str(),
SanitizePath(res1.c_str()).c_str()) == 0);
OCIO_CHECK_NO_THROW(resolvedSource = context->resolveFileLocation("GPUHelpers.h"));
const std::string res2 = searchPath2 + "/GPUHelpers.h";
OCIO_CHECK_NO_THROW(resolvedSource = context->resolveFileLocation("GPUUnitTest.h"));
const std::string res2 = searchPath2 + "/GPUUnitTest.h";
OCIO_CHECK_ASSERT(strcmp(SanitizePath(resolvedSource.c_str()).c_str(),
SanitizePath(res2.c_str()).c_str()) == 0);
}
Expand All @@ -141,8 +141,8 @@ OCIO_ADD_TEST(Context, use_searchpaths_workingdir)
const std::string res1 = ociodir + "/" + searchPath1 + "/Context.cpp";
OCIO_CHECK_ASSERT(strcmp(SanitizePath(resolvedSource.c_str()).c_str(),
SanitizePath(res1.c_str()).c_str()) == 0);
OCIO_CHECK_NO_THROW(resolvedSource = context->resolveFileLocation("GPUHelpers.h"));
const std::string res2 = ociodir + "/" + searchPath2 + "/GPUHelpers.h";
OCIO_CHECK_NO_THROW(resolvedSource = context->resolveFileLocation("GPUUnitTest.h"));
const std::string res2 = ociodir + "/" + searchPath2 + "/GPUUnitTest.h";
OCIO_CHECK_ASSERT(strcmp(SanitizePath(resolvedSource.c_str()).c_str(),
SanitizePath(res2.c_str()).c_str()) == 0);
}
Expand Down
22 changes: 22 additions & 0 deletions tests/data/files/lut3d_arbitrary.csp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
CSPLUTV100
3D

2
0.0 1.0
0.0 1.0
2
0.0 1.0
0.0 1.0
2
0.0 1.0
0.0 1.0

2 2 2
0.100000 0.100000 0.100000
1.100000 0.100000 0.100000
0.100000 1.100000 0.100000
1.100000 1.100000 0.100000
0.100000 0.100000 1.100000
1.100000 0.100000 1.100000
0.100000 1.100000 1.100000
1.100000 1.100000 1.100000
22 changes: 22 additions & 0 deletions tests/data/files/lut3d_blu-only.csp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
CSPLUTV100
3D

2
0.0 1.0
0.0 1.0
2
0.0 1.0
0.0 1.0
2
0.0 1.0
0.0 1.0

2 2 2
0.0 0.0 0.0
0.0 0.0 0.0
0.0 0.0 0.0
0.0 0.0 0.0
0.0 0.0 1.0
0.0 0.0 1.0
0.0 0.0 1.0
0.0 0.0 1.0
22 changes: 22 additions & 0 deletions tests/data/files/lut3d_grn-only.csp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
CSPLUTV100
3D

2
0.0 1.0
0.0 1.0
2
0.0 1.0
0.0 1.0
2
0.0 1.0
0.0 1.0

2 2 2
0.0 0.0 0.0
0.0 0.0 0.0
0.0 0.0 0.0
0.0 0.0 0.0
0.0 1.0 0.0
0.0 1.0 0.0
0.0 1.0 0.0
0.0 1.0 0.0
22 changes: 22 additions & 0 deletions tests/data/files/lut3d_red-only.csp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
CSPLUTV100
3D

2
0.0 1.0
0.0 1.0
2
0.0 1.0
0.0 1.0
2
0.0 1.0
0.0 1.0

2 2 2
0.0 0.0 0.0
0.0 0.0 0.0
0.0 0.0 0.0
0.0 0.0 0.0
1.0 0.0 0.0
1.0 0.0 0.0
1.0 0.0 0.0
1.0 0.0 0.0
1 change: 0 additions & 1 deletion tests/gpu/CDLOp_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <OpenColorIO/OpenColorIO.h>

#include "GPUUnitTest.h"
#include "GPUHelpers.h"


namespace OCIO = OCIO_NAMESPACE;
Expand Down
1 change: 0 additions & 1 deletion tests/gpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ set(SOURCES
ECOp_test.cpp
FixedFunctionOp_test.cpp
GammaOp_test.cpp
GPUHelpers.cpp
GPUUnitTest.cpp
GradingPrimaryOp_test.cpp
GradingRGBCurveOp_test.cpp
Expand Down
58 changes: 0 additions & 58 deletions tests/gpu/GPUHelpers.cpp
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions tests/gpu/GPUHelpers.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tests/gpu/Lut1DOp_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <OpenColorIO/OpenColorIO.h>

#include "GPUUnitTest.h"
#include "GPUHelpers.h"

namespace OCIO = OCIO_NAMESPACE;

Expand Down
Loading
Loading