Skip to content
Permalink
Browse files

Remove broken CUDA/ComputeContext support

  • Loading branch information...
Stefan Eilemann Stefan Eilemann
Stefan Eilemann authored and Stefan Eilemann committed Sep 27, 2016
1 parent 63317a5 commit 9e7e887ef364af4495027fb01976572021d1c42d
Showing with 4 additions and 4,207 deletions.
  1. +0 −31 ACKNOWLEDGEMENTS
  2. +0 −9 CMakeLists.txt
  3. +2 −0 doc/Changelog.md
  4. +0 −11 eq/CMakeLists.txt
  5. +0 −41 eq/computeContext.cpp
  6. +0 −82 eq/computeContext.h
  7. +0 −183 eq/cudaContext.cpp
  8. +0 −53 eq/cudaContext.h
  9. +0 −3 eq/error.h
  10. +1 −7 eq/fabric/error.cpp
  11. +0 −3 eq/fabric/errorCodes.h
  12. +0 −1 eq/fabric/pipe.h
  13. +0 −1 eq/fabric/pipe.ipp
  14. +1 −58 eq/pipe.cpp
  15. +0 −15 eq/pipe.h
  16. +0 −1 eq/server/global.cpp
  17. +0 −2 eq/server/loader.l
  18. +0 −10 eq/server/loader.y
  19. +0 −1 eq/server/pipe.cpp
  20. +0 −1 eq/types.h
  21. +0 −3 examples/CMakeLists.txt
  22. +0 −49 examples/eqNBody/CMakeLists.txt
  23. +0 −47 examples/eqNBody/README
  24. +0 −112 examples/eqNBody/channel.cpp
  25. +0 −61 examples/eqNBody/channel.h
  26. +0 −116 examples/eqNBody/client.cpp
  27. +0 −62 examples/eqNBody/client.h
  28. +0 −231 examples/eqNBody/config.cpp
  29. +0 −79 examples/eqNBody/config.h
  30. +0 −35 examples/eqNBody/config/CUDA-1-window.2D.eqc
  31. +0 −69 examples/eqNBody/config/CUDA-2-window.2D.eqc
  32. +0 −115 examples/eqNBody/config/CUDA-4-window.2D.eqc
  33. +0 −45 examples/eqNBody/configEvent.h
  34. +0 −228 examples/eqNBody/controller.cpp
  35. +0 −86 examples/eqNBody/controller.h
  36. +0 −356 examples/eqNBody/frameData.cpp
  37. +0 −129 examples/eqNBody/frameData.h
  38. +0 −63 examples/eqNBody/initData.cpp
  39. +0 −66 examples/eqNBody/initData.h
  40. +0 −97 examples/eqNBody/main.cpp
  41. +0 −178 examples/eqNBody/nbody.cu
  42. +0 −57 examples/eqNBody/nbody.h
  43. +0 −237 examples/eqNBody/nbody_kernel.cu
  44. +0 −53 examples/eqNBody/node.cpp
  45. +0 −49 examples/eqNBody/node.h
  46. +0 −97 examples/eqNBody/pipe.cpp
  47. +0 −61 examples/eqNBody/pipe.h
  48. +0 −303 examples/eqNBody/render_particles.cpp
  49. +0 −100 examples/eqNBody/render_particles.h
  50. +0 −138 examples/eqNBody/sharedData.cpp
  51. +0 −82 examples/eqNBody/sharedData.h
  52. +0 −114 examples/eqNBody/sharedDataProxy.cpp
  53. +0 −78 examples/eqNBody/sharedDataProxy.h
  54. +0 −50 examples/eqNBody/window.cpp
  55. +0 −48 examples/eqNBody/window.h
@@ -132,37 +132,6 @@ OpenGL(TM) is a trademark of Silicon Graphics, Inc.
WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.


===========================================================================
Parts of the eqNBody CUDA example
===========================================================================

Copyright 1993-2006 NVIDIA Corporation. All rights reserved.

NOTICE TO USER:

This source code is subject to NVIDIA ownership rights under U.S. and
international Copyright laws.

NVIDIA MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR
IMPLIED WARRANTY OF ANY KIND. NVIDIA DISCLAIMS ALL WARRANTIES WITH
REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.

U.S. Government End Users. This source code is a "commercial item" as
that term is defined at 48 C.F.R. 2.101 (OCT 1995), consisting of
"commercial computer software" and "commercial computer software
documentation" as such terms are used in 48 C.F.R. 12.212 (SEPT 1995)
and is provided to the U.S. Government only as a commercial end item.
Consistent with 48 C.F.R.12.212 and 48 C.F.R. 227.7202-1 through
227.7202-4 (JUNE 1995), all U.S. Government End Users acquire the
source code with only those rights set forth herein.

===========================================================================
Parts of the osgScaleViewer example
===========================================================================
@@ -56,7 +56,6 @@ endif()
common_find_package(Boost REQUIRED COMPONENTS
program_options filesystem system thread)
common_find_package(Collage REQUIRED)
# broken: common_find_package(CUDA)
common_find_package(Deflect)
common_find_package(GLStats)
common_find_package(hwloc)
@@ -85,10 +84,6 @@ if(APPLE) # tweak window systems before finding glew
common_find_package_disable(Qt5Core Qt5Gui Qt5Widgets)
endif()
endif()
if(CMAKE_OSX_ARCHITECTURES MATCHES "64")
common_find_package_disable(CUDA)
endif()
set(CUDA_64_BIT_DEVICE_CODE OFF)
endif()
common_find_package(GLEW_MX)

@@ -151,10 +146,6 @@ if(APPLE)
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /opt/local /usr/local)
endif()

if(CUDA_FOUND)
set(CUDA_PROPAGATE_HOST_FLAGS OFF)
endif()

list(APPEND CPPCHECK_EXTRA_ARGS -DEQUALIZERFABRIC_STATIC=)

if(MSVC)
@@ -3,6 +3,8 @@ Changelog {#Changelog}

# Release 1.13 (git master)

* [584](https://github.com/Eyescale/Equalizer/pull/584):
Removed broken CUDA/ComputeContext support
* [578](https://github.com/Eyescale/Equalizer/pull/578):
Application command line arguments are transmitted to render clients.
Subsets of environmental variables can also be transmitted based on their
@@ -1,9 +1,6 @@
# Copyright (c) 2011-2016 Stefan Eilemann <eile@eyescale.ch>

include_directories(SYSTEM ${OPENGL_INCLUDE_DIR} ${GLEW_MX_INCLUDE_DIRS})
if(CUDA_FOUND)
include_directories(SYSTEM ${CUDA_INCLUDE_DIRS})
endif()

install(FILES DESTINATION include/eq COMPONENT dev)

@@ -28,11 +25,9 @@ set(EQUALIZER_PUBLIC_HEADERS
compressor/compressor.h
compressor/compressorReadDrawPixels.h
compressor/compressorYUV.h
computeContext.h
config.h
configEvent.h
configStatistics.h
cudaContext.h
eq.h
error.h
eventHandler.h
@@ -122,10 +117,8 @@ set(EQUALIZER_SOURCES
client.cpp
commandQueue.cpp
compositor.cpp
computeContext.cpp
config.cpp
configStatistics.cpp
cudaContext.cpp
detail/channel.ipp
detail/fileFrameWriter.cpp
eventHandler.cpp
@@ -287,10 +280,6 @@ if(VRPN_FOUND)
list(APPEND EQUALIZER_LINK_LIBRARIES ${VRPN_LIBRARIES})
endif()

if(CUDA_FOUND)
list(APPEND EQUALIZER_LINK_LIBRARIES ${CUDA_LIBRARIES})
endif()

set(EQUALIZER_OMIT_LIBRARY_HEADER ON)
common_library(Equalizer)
target_compile_definitions(Equalizer PRIVATE EQUALIZERFABRIC_SHARED_INL)

This file was deleted.

This file was deleted.

0 comments on commit 9e7e887

Please sign in to comment.
You can’t perform that action at this time.