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.

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

Support CUDA 10 in OptiX #605

Merged
merged 2 commits into from
Nov 14, 2018
Merged

Support CUDA 10 in OptiX #605

merged 2 commits into from
Nov 14, 2018

Conversation

karjonas
Copy link
Contributor

No description provided.

Copy link
Contributor

@hernando hernando left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you be more specific about what are you trying to "fix" with this. I just looks like you're trying to silent a warning. I would like to know which warning before approving.

@karjonas
Copy link
Contributor Author

It is this warning

In file included from /home/jkarlsso/local/NVIDIA-OptiX-SDK-5.1.1-linux64/include/internal/optix_datatypes.h:33:0,
                 from /home/jkarlsso/local/NVIDIA-OptiX-SDK-5.1.1-linux64/include/optixu/optixu_math_namespace.h:57,
                 from /home/jkarlsso/local/NVIDIA-OptiX-SDK-5.1.1-linux64/include/optixu/optixu_math_stream_namespace.h:33,
                 from /home/jkarlsso/Work/Brayns/ospray_modules/optix/camera/Camera.h:26,
                 from /home/jkarlsso/Work/Brayns/ospray_modules/optix/camera/Camera.cpp:21:
/usr/local/cuda/include/host_defines.h:54:2: warning: #warning "host_defines.h is an internal header file and must not be used directly.  This file will be removed in a future CUDA release.  Please use cuda_runtime_api.h or cuda_runtime.h instead." [-Wcpp]
 #warning "host_defines.h is an internal header file and must not be used directly.  This file will be removed in a future CUDA release.  Please use cuda_runtime_api.h or cuda_runtime.h instead."

* Update CMake/common to get CUDA 10 fixes.
* Add ignore for deprecated CUDA header warning in OptiX
@karjonas
Copy link
Contributor Author

Commit message is updated.

@hernando
Copy link
Contributor

hernando commented Nov 14, 2018

You can remove #include <optixu/optixu_math_stream_namespace.h> from Camera.h. It still compiles without it for me.

@karjonas
Copy link
Contributor Author

That is not enough, I still get more errors from other OptiX include files which are needed for compilation.

@hernando
Copy link
Contributor

OK, OptiX wins

@hernando hernando merged commit ed22a00 into BlueBrain:master Nov 14, 2018
@karjonas karjonas deleted the optix_cuda_10 branch November 15, 2018 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants