Closed Robadob closed 1 year ago
All tests ran using `--gtest_filter=glm`, With Windows/Debug/GLM=ON
C, Without using environment var
[----------] Global test environment tear-down
[==========] 34 tests from 24 test suites ran. (270287 ms total)
[ PASSED ] 34 tests.
C, after deleting tmp/flamegpu/jitifycache
and SET GLM_INC_DIR=c:/windows
.
[----------] 2 tests from DeviceRTCAPITest
[ RUN ] DeviceRTCAPITest.AgentFunction_array_get_glm
C:\Users\Robert\fgpu2\fgpu2\src\flamegpu\detail\JitifyCache.cu(235): Error environment variable GLM_INC_DIR (c:/windows) does not contain glm/glm.hpp. Please correct this environment variable.
C, after SET GLM_INC_DIR=C:\Users\Robert\fgpu2\fgpu2\build\_deps\glm-src2
(renamed dir to be sure it wasn't cheating).
[----------] Global test environment tear-down
[==========] 34 tests from 24 test suites ran. (271615 ms total)
[ PASSED ] 34 tests.
Can't find any GLM tests in python test suite (would explain pyflamegpu.GLM
) not being a thing.
Doesn't appear SWIG has GLM mappings setup either (did this get left on hold because of the Jitify slow compilation?). Regardless, the current changes should be appropriate, as it can still be used within RTC without being directly used in Python.
Not sure the warning on module import is a good addition either. importing a python module should be quiet IMO.
Line 6 of the same file, there's already a warning for the FLAMEGPU inc dir version, I just copied similar pattern.
Otherwise good suggestions, will apply later in the week when I'm back on proper FGPU stuff. GLM + py is still a bit experimental.
Line 6 of the same file, there's already a warning for the FLAMEGPU inc dir version, I just copied similar pattern.
That's fair (and I'd prolly lean towards getting rid of that too to be honest, but can be a future thing)
pyflamegpu.GLM
now reports GLM statusFLAMEGPU_USE_GLM
is the pre-existing C macroWhen searching for GLM include files, RTC now tries the
GLM_INC_DIR
environment variablePackage GLM include inside wheel alongside FLAMEGPU headers
When importing pyflamegpu,
GLM_INC_DIR
is set to the location of GLM include dir within the module's install[x] Package GLM headers/license inside python wheel
[x] Setup
GLM_INC_DIR
environment variable to be used[x] Document
GLM_INC_DIR
environment variable[x] Add
GLM
flag to SWIG[x] Only setup
GLM_INC_DIR
inside wheel when GLM enabled in buildCloses #1001