commit 33b4f65383e3de7709d893c80ce0bcf12cbefac0
parent 0b7f47707a70b4aa44e1c6bcb8746fec8e820760
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Tue, 19 Oct 2021 15:19:33 +0200
Set the required version of StarSP to 0.12
Older versions do not compile with gcc 11. This commit handles API breaks
introduced by StarSP 12.
Diffstat:
18 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -29,7 +29,7 @@ find_package(Star3D 0.7.2 REQUIRED)
find_package(Star3DUT 0.3.1 REQUIRED)
find_package(StarCPR 0.1.2 REQUIRED)
find_package(StarSF 0.6 REQUIRED)
-find_package(StarSP 0.8.1 REQUIRED)
+find_package(StarSP 0.12 REQUIRED)
find_package(OpenMP 1.2 REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${RCMAKE_SOURCE_DIR})
diff --git a/src/ssol_draw_draft.c b/src/ssol_draw_draft.c
@@ -163,7 +163,7 @@ ssol_draw_draft
res = darray_float_reserve(&samples, spp * 2/*#dimensions*/);
if(res != RES_OK) goto error;
- res = ssp_rng_create(scn->dev->allocator, &ssp_rng_threefry, &rng);
+ res = ssp_rng_create(scn->dev->allocator, SSP_RNG_THREEFRY, &rng);
if(res != RES_OK) goto error;
/* Generate the pixel samples */
diff --git a/src/ssol_draw_pt.c b/src/ssol_draw_pt.c
@@ -366,7 +366,7 @@ ssol_draw_pt
/* Create a RNG proxy */
res = ssp_rng_proxy_create
- (scn->dev->allocator, &ssp_rng_threefry, scn->dev->nthreads, &rng_proxy);
+ (scn->dev->allocator, SSP_RNG_THREEFRY, scn->dev->nthreads, &rng_proxy);
if(res != RES_OK) goto error;
res = sun_create_wavelength_distribution(scn->sun, &ran_sun_wl);
diff --git a/src/ssol_estimator.c b/src/ssol_estimator.c
@@ -368,7 +368,7 @@ res_T
estimator_save_rng_state
(struct ssol_estimator* estimator, const struct ssp_rng_proxy* proxy)
{
- struct ssp_rng_type rng_type;
+ enum ssp_rng_type rng_type;
FILE* stream = NULL;
res_T res = RES_OK;
ASSERT(estimator && proxy);
@@ -388,7 +388,7 @@ estimator_save_rng_state
}
SSP(rng_proxy_get_type(proxy, &rng_type));
- res = ssp_rng_create(estimator->dev->allocator, &rng_type, &estimator->rng);
+ res = ssp_rng_create(estimator->dev->allocator, rng_type, &estimator->rng);
if(res != RES_OK) {
log_error(estimator->dev,
"Could not create the RNG to save the proxy RNG state.\n");
diff --git a/src/test_ssol_by_receiver_integration.c b/src/test_ssol_by_receiver_integration.c
@@ -81,7 +81,7 @@ main(int argc, char** argv)
CHK(ssol_device_create
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_directional(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver1.c b/src/test_ssol_solver1.c
@@ -54,8 +54,8 @@ main(int argc, char** argv)
struct ssp_rng* rng;
struct ssp_rng* rng2;
const struct ssp_rng* rng_state;
- struct ssp_rng_type rng_type0;
- struct ssp_rng_type rng_type1;
+ enum ssp_rng_type rng_type0;
+ enum ssp_rng_type rng_type1;
struct ssol_scene* scene;
struct ssol_shape* dummy;
struct ssol_shape* square;
@@ -111,7 +111,7 @@ main(int argc, char** argv)
CHK(ssol_device_create
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
desc.wavelengths = wavelengths;
desc.intensities = intensities;
@@ -247,11 +247,11 @@ main(int argc, char** argv)
CHK(ssol_estimator_get_rng_state(estimator, &rng_state) == RES_OK);
CHK(ssp_rng_get_type(rng_state, &rng_type0) == RES_OK);
CHK(ssp_rng_get_type(rng, &rng_type1) == RES_OK);
- CHK(ssp_rng_type_eq(&rng_type0, &rng_type1));
+ CHK(rng_type0 == rng_type1);
/* Clone the rng_state */
CHK(stream = tmpfile());
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng2) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng2) == RES_OK);
CHK(ssp_rng_write(rng_state, stream) == RES_OK);
rewind(stream);
CHK(ssp_rng_read(rng2, stream) == RES_OK);
diff --git a/src/test_ssol_solver10.c b/src/test_ssol_solver10.c
@@ -91,7 +91,7 @@ main(int argc, char** argv)
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
#define DNI 1000
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_pillbox(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver11.c b/src/test_ssol_solver11.c
@@ -91,7 +91,7 @@ main(int argc, char** argv)
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
#define DNI 1000
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_buie(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver12.c b/src/test_ssol_solver12.c
@@ -91,7 +91,7 @@ main(int argc, char** argv)
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
#define DNI 1000
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_gaussian(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver2.c b/src/test_ssol_solver2.c
@@ -104,7 +104,7 @@ main(int argc, char** argv)
CHK(ssol_device_create
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_directional(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver2b.c b/src/test_ssol_solver2b.c
@@ -103,7 +103,7 @@ main(int argc, char** argv)
CHK(ssol_device_create
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_directional(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver3.c b/src/test_ssol_solver3.c
@@ -84,7 +84,7 @@ main(int argc, char** argv)
CHK(ssol_device_create
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_directional(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver4.c b/src/test_ssol_solver4.c
@@ -85,7 +85,7 @@ main(int argc, char** argv)
CHK(ssol_device_create
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_directional(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver5.c b/src/test_ssol_solver5.c
@@ -84,7 +84,7 @@ main(int argc, char** argv)
CHK(ssol_device_create
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_directional(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver6.c b/src/test_ssol_solver6.c
@@ -90,7 +90,7 @@ main(int argc, char** argv)
CHK(ssol_device_create
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_directional(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver7.c b/src/test_ssol_solver7.c
@@ -102,7 +102,7 @@ main(int argc, char** argv)
CHK(ssol_device_create(NULL, &allocator, 1, 0, &dev) == RES_OK);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_directional(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver8.c b/src/test_ssol_solver8.c
@@ -87,7 +87,7 @@ main(int argc, char** argv)
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
#define DNI 1000
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_directional(dev, &sun) == RES_OK);
diff --git a/src/test_ssol_solver9.c b/src/test_ssol_solver9.c
@@ -89,7 +89,7 @@ main(int argc, char** argv)
(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev) == RES_OK);
#define DNI 1000
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(ssol_spectrum_create(dev, &spectrum) == RES_OK);
CHK(ssol_spectrum_setup(spectrum, get_wlen, 3, NULL) == RES_OK);
CHK(ssol_sun_create_directional(dev, &sun) == RES_OK);
