Move GPU LUT files into the tests dir

Instead of creating temporary LUT files for GPU tests, read them from the testdata directory instead. This removes the need to clean them up after each run. Signed-off-by: Ananth Bhaskararaman <ananth.b@qubecinema.com>
AcademySoftwareFoundation · Oct 1, 2024 · 102a06d · 102a06d
1 parent 4dd0273
commit 102a06d
Show file tree

Hide file tree

Showing 14 changed files with 146 additions and 271 deletions.
diff --git a/tests/data/files/Lut3DOp_arbitrary_using_CSP_file.csp b/tests/data/files/Lut3DOp_arbitrary_using_CSP_file.csp
@@ -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
diff --git a/tests/data/files/Lut3DOp_arbitrary_using_CSP_file_legacy_shader.csp b/tests/data/files/Lut3DOp_arbitrary_using_CSP_file_legacy_shader.csp
@@ -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
diff --git a/tests/data/files/Lut3DOp_blue_only_using_CSP_file_legacy_shader.csp b/tests/data/files/Lut3DOp_blue_only_using_CSP_file_legacy_shader.csp
@@ -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
diff --git a/tests/data/files/Lut3DOp_green_only_using_CSP_file_legacy_shader.csp b/tests/data/files/Lut3DOp_green_only_using_CSP_file_legacy_shader.csp
@@ -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
diff --git a/tests/data/files/Lut3DOp_red_only_using_CSP_file_legacy_shader.csp b/tests/data/files/Lut3DOp_red_only_using_CSP_file_legacy_shader.csp
@@ -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
diff --git a/tests/gpu/CDLOp_test.cpp b/tests/gpu/CDLOp_test.cpp
@@ -9,7 +9,6 @@
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "GPUUnitTest.h"
-#include "GPUHelpers.h"
 
 
 namespace OCIO = OCIO_NAMESPACE;

diff --git a/tests/gpu/CMakeLists.txt b/tests/gpu/CMakeLists.txt
@@ -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
@@ -26,7 +25,7 @@ set(SOURCES
 
 add_executable(test_gpu_exec ${SOURCES})
 
-set_target_properties(test_gpu_exec PROPERTIES 
+set_target_properties(test_gpu_exec PROPERTIES
 	COMPILE_OPTIONS "${PLATFORM_COMPILE_OPTIONS}"
 	LINK_OPTIONS "${PLATFORM_LINK_OPTIONS}"
 )

diff --git a/tests/gpu/GPUHelpers.cpp b/tests/gpu/GPUHelpers.cpp
diff --git a/tests/gpu/GPUHelpers.h b/tests/gpu/GPUHelpers.h
diff --git a/tests/gpu/GPUUnitTest.cpp b/tests/gpu/GPUUnitTest.cpp
@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <cmath>
 #include <cstring>
-#include <iomanip>
 #include <iostream>
 #include <sstream>
 
@@ -333,11 +332,11 @@ namespace
 
         OCIO::ConstProcessorRcPtr & processor = test->getProcessor();
         OCIO::GpuShaderDescRcPtr & shaderDesc = test->getShaderDesc();
-        
+
         OCIO::ConstGPUProcessorRcPtr gpu;
         if (test->isLegacyShader())
         {
-            gpu = processor->getOptimizedLegacyGPUProcessor(OCIO::OPTIMIZATION_DEFAULT, 
+            gpu = processor->getOptimizedLegacyGPUProcessor(OCIO::OPTIMIZATION_DEFAULT,
                                                             test->getLegacyShaderLutEdge());
         }
         else
@@ -575,7 +574,7 @@ int main(int argc, const char ** argv)
 
     // Step 1: Initialize the graphic library engines.
     OCIO::OglAppRcPtr app;
-    
+
     try
     {
         if(useMetalRenderer)

diff --git a/tests/gpu/GPUUnitTest.h b/tests/gpu/GPUUnitTest.h
@@ -20,7 +20,7 @@ using OCIOTestFuncCallback = std::function<void(OCIOGPUTest & test)>;
 //
 // By default, the framework compares the GPU results to the CPU results
 // using an automatically generated neutral ramp for the standard range [0, 1].
-// 
+//
 class OCIOGPUTest
 {
     public:
@@ -30,7 +30,7 @@ class OCIOGPUTest
             typedef std::vector<float> Values;
             Values m_inputValues;
 
-            // Keeping the original input value size allows 
+            // Keeping the original input value size allows
             // to avoid manipulating padded values added to fit
             // the predefined GPU texture size.
             size_t m_originalInputValueSize{ 0 };
@@ -50,7 +50,7 @@ class OCIOGPUTest
         void setProcessor(OCIO_NAMESPACE::TransformRcPtr transform);
 
         void setProcessor(OCIO_NAMESPACE::ConstProcessorRcPtr processor);
-    
+
         void setShadingLanguage(OCIO_NAMESPACE::GpuLanguage gpuShadingLanguage)
         {
             m_gpuShadingLanguage = gpuShadingLanguage;
@@ -75,7 +75,7 @@ class OCIOGPUTest
         inline void setTestInfinity(bool use) { m_testInfinity = use; }
 
         // Provide a set of RGBA values to test (otherwise a neutral ramp will be used).
-        // TestWideRange, TestNaN & TestInfinity are used when m_inputValues is empty. 
+        // TestWideRange, TestNaN & TestInfinity are used when m_inputValues is empty.
         inline void setCustomValues(CustomValues & values) { m_values = values; }
         inline CustomValues & getCustomValues() { return m_values; }
 
@@ -85,7 +85,7 @@ class OCIOGPUTest
         inline bool getRelativeComparison() const { return m_performRelativeComparison; }
         inline void setRelativeComparison(bool relCompare) { m_performRelativeComparison = relCompare; }
 
-        // This is the lower bound for the value that is divided into the absolute error 
+        // This is the lower bound for the value that is divided into the absolute error
         // to obtain the relative error.
         inline float getExpectedMinimalValue() const { return m_expectedMinimalValue; }
         inline void setExpectedMinimalValue(float minValue) { m_expectedMinimalValue = minValue; }

diff --git a/tests/gpu/Lut1DOp_test.cpp b/tests/gpu/Lut1DOp_test.cpp
@@ -9,7 +9,6 @@
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "GPUUnitTest.h"
-#include "GPUHelpers.h"
 
 namespace OCIO = OCIO_NAMESPACE;