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

Minor cleanups and CMake Min. Versions #92

Merged
merged 3 commits into from
Oct 30, 2013

Conversation

ax3l
Copy link
Member

@ax3l ax3l commented Oct 28, 2013

  • CMake: check for boost 1.49+ (move) and CUDA 5.0+ (hypnos fallback)
  • includes: add missing mpl/find header
  • virtual inheritance: remove : virtual public BaseClass (not really necessary but complicates GPUOcelot parses)
  • kernels: remove only static kernel function in the whole code (not necessary)

@ghost ghost assigned f-schmitt Oct 28, 2013
@ax3l
Copy link
Member Author

ax3l commented Oct 28, 2013

Dare you compile suite, why does no one update your cuda? :)

@@ -57,7 +57,12 @@ set(CMAKE_PREFIX_PATH "/usr/lib/x86_64-linux-gnu/" "$ENV{MPI_ROOT}"
# Find CUDA
################################################################################

find_package(CUDA REQUIRED)
find_package(CUDA 5.0 REQUIRED)
Copy link
Member

Choose a reason for hiding this comment

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

What's the dependency that forces this?

Copy link
Member Author

Choose a reason for hiding this comment

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

Actually, we require CUDA 5.5 due to driver bugs at least with the sm_35 architecture. But one can use cuda 5.0 with cuda-5.5-like drivers.

@psychocoderHPC Knows why we need CUDA 5.0+ itself. I have in mind some minor features/bugs required updating (at least today, I recognised compile errors with cuda 4.2 + recent boost versions).

Copy link
Member

Choose a reason for hiding this comment

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

CUDA 5.5 drivers are currently unavailable on Taurus due to ECC problems.

Copy link
Member Author

Choose a reason for hiding this comment

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

I know, that complicates the whole dependency problem cycle, but forcing 5.0+ should be flexible enough for that.

Copy link
Member

Choose a reason for hiding this comment

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

CUDA 5.0 is now one year old. I think it is OK to say that we support 5.0+ (we had no system with 4.2 to check bugs).

Copy link
Member Author

Choose a reason for hiding this comment

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

👍 One also has to keep in mind, that installing CUDA only gets easier with new versions and new CUDA versions usually run on old hardware without problems.

Copy link
Member

Choose a reason for hiding this comment

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

Agreed. I see no particular problem in enforcing CUDA 5.0. Once we start to grow our user base, we might think about staying backward compatible, since many users won't be able to alter the installations on their clusters.

@ax3l
Copy link
Member Author

ax3l commented Oct 29, 2013

I am updating the CompileSuite client to run with boost 1.49 (already) and Cuda 5.5. Afterwards I will push an other commit (find libSplash version number in CMake) to trigger a new test.

ax3l added 3 commits October 29, 2013 14:36
- CMake: check for boost 1.49+ (move) and CUDA 5.0+ (hypnos fallback)
- include: add a missing mpl/find header
- virtual inheritance: remove ": virtual public BaseClass" (not really
  necessary but complicates GPUocelot parses)
- kernel: remove last "static" kernel function in the whole code
  (not necessary)
@f-schmitt
Copy link
Member

I'll have a last look and merge that tomorrow.

@f-schmitt
Copy link
Member

Looks good to me, it goes in.

f-schmitt added a commit that referenced this pull request Oct 30, 2013
Minor cleanups and CMake Min. Versions
@f-schmitt f-schmitt merged commit c551e08 into ComputationalRadiationPhysics:dev Oct 30, 2013
@ax3l ax3l deleted the topic/cmakeMin branch October 30, 2013 08:51
slizzered pushed a commit to slizzered/picongpu that referenced this pull request Sep 28, 2015
80bf2b0 Merge pull request ComputationalRadiationPhysics#102 from ComputationalRadiationPhysics/dev
ef29c73 Merge pull request ComputationalRadiationPhysics#101 from slizzered/prepare-version_2_2_crp
248539c changelog entry for 2.2.0crp
f57b59b version bump to 2.2.0crp
3b91c67 Merge pull request ComputationalRadiationPhysics#100 from slizzered/issue98-rename_uint_typedef
aeab138 the backslash is now aligned
af6b7ca changed type to match __ballot signature
17389a5 removed typedef uint32_richtig_huebsch
b5737f7 Merge pull request ComputationalRadiationPhysics#97 from slizzered/issue65-add_comment
1d0b136 Added TODO to boost_static_assert cast warning
da904d0 Merge pull request ComputationalRadiationPhysics#95 from ax3l/topic-wshadow
ca39cbc Fix Wshadow Warnings
0e7e517 Add Wshadow
65e010d Merge pull request ComputationalRadiationPhysics#93 from ax3l/doc-updateCMakeVersion
b4d0657 Add a CMake 2.8.12.2 PPA for Precise
3eb9205 Close ComputationalRadiationPhysics#92: Update CMake Version to 2.8.12.2+
bb96ed9 Merge pull request ComputationalRadiationPhysics#91 from BenjaminW3/patch-3
2fafcbd Merge pull request ComputationalRadiationPhysics#89 from BenjaminW3/patch-1
f09c782 Define __THROW for systems without Glibc
133eb65 Merge pull request ComputationalRadiationPhysics#90 from BenjaminW3/patch-2
01b2dd7 fix a spelling mistake
229c891 fix unconditional usage of getAvailableSlotsHost
1b1819a Merge pull request ComputationalRadiationPhysics#87 from BenjaminW3/fix-struct-class
5f4adf5 fix non-matching class/struct declaration
799d7d7 Merge pull request ComputationalRadiationPhysics#84 from ComputationalRadiationPhysics/dev
1314bf2 Merge pull request ComputationalRadiationPhysics#76 from ComputationalRadiationPhysics/dev
ddeae86 Merge pull request ComputationalRadiationPhysics#56 from ComputationalRadiationPhysics/dev

git-subtree-dir: thirdParty/mallocMC
git-subtree-split: 80bf2b0d0ec33bf350c5de4cc5dc11231f9ee7cd
BeyondEspresso pushed a commit to BeyondEspresso/picongpu that referenced this pull request Nov 12, 2018
…lRadiationPhysics/update_default_setup_LWFA_STII_0.4.1

update setup to what is actually running right now
psychocoderHPC pushed a commit to psychocoderHPC/picongpu that referenced this pull request May 9, 2019
a96b293 Merge pull request ComputationalRadiationPhysics#106 from fwyzard/cupla_accelerator_namespace
1af2b2b Merge pull request ComputationalRadiationPhysics#110 from tdd11235813/cmake-macro
663521c Changes function to macro 'CUPLA_ADD_EXECUTABLE'.
a440a7c Fix namespace definition if two accelerators are selected
64f02bb Move all accelerator-specific code to an inline namespece
bbef699 Merge pull request ComputationalRadiationPhysics#105 from fwyzard/tbb_IsThreadSeqAcc
b463a25 Mark the TBB backend as "thread sequential"
b45d4e9 Merge pull request ComputationalRadiationPhysics#102 from psychocoderHPC/topic-updateToLatestAlapkaDev
7e8b832 createTaskExec -> createTaskKernel
84b6dc1 update to latest alapka develop branch
037f7b2 Merge pull request ComputationalRadiationPhysics#100 from DerWaldschrat/dev
7add5ed fix -Wreorder in cuplaPitchedPtr (#4)
9fa745b Merge pull request ComputationalRadiationPhysics#99 from ax3l/topic-cmake312rootHints
041d454 Merge pull request ComputationalRadiationPhysics#98 from DerWaldschrat/dev-fix
ecc5839 CMake: Honor _ROOT Env Hints
24d159a Added conditional check for backends.
5822555 Add cudaEventBlockingSync to event creation
906cd41 Merge pull request ComputationalRadiationPhysics#97 from psychocoderHPC/topic-HIPBackend
bc67259 alpaka backend: HIP
87fe58d Merge pull request ComputationalRadiationPhysics#96 from psychocoderHPC/fix-kernelSharedMemCalc
68877b5 fix dynamic shared mem definition
9452a70 Merge pull request ComputationalRadiationPhysics#95 from psychocoderHPC/topic-updateDocs
8b26918 update docs
e822bfa Merge pull request ComputationalRadiationPhysics#89 from psychocoderHPC/topic-switchToAlpakaDevelop0.4.X
50cedbc alpaka renamings + cmake version incerase
5ecd227 update to alapka dev upcoming version 0.4.X
66a9240 Merge pull request ComputationalRadiationPhysics#94 from psychocoderHPC/topic-ciUpdateToCUDA8
3ba6104 CI: update CUDA from 7.5 to 8.0
5af56ce Merge pull request ComputationalRadiationPhysics#93 from psychocoderHPC/topic-updateCIToClang4
68a6555 Travis: CUDA Compiler Ignore
279bfd0 Travis: Xenial
9d583b7 CI: switch from clan 3.5 to 4.0
11eb874 Merge pull request ComputationalRadiationPhysics#92 from ax3l/topic-ciCMake3110
da617da Travis: CMake 3.11.0
da63524 Merge pull request ComputationalRadiationPhysics#91 from ComputationalRadiationPhysics/dev
66a2da7 Merge pull request ComputationalRadiationPhysics#88 from psychocoderHPC/topic-versionIncreaseTo0.1.1
e029584 version increase to 0.1.1
ffdb268 Merge pull request ComputationalRadiationPhysics#90 from psychocoderHPC/fix-tbbSelection
06030af fix TBB backend activation
aa8a921 Merge pull request ComputationalRadiationPhysics#84 from psychocoderHPC/topic-cuplaGetErrorString
55c99b7 add implementation for `cuplaGetErrorString`
c765052 Merge pull request ComputationalRadiationPhysics#86 from psychocoderHPC/topic-cuplaPeekAtLastError
49612bb Merge pull request ComputationalRadiationPhysics#87 from psychocoderHPC/topic-helpUpdatecuplaGetLastError
c763de4 Merge pull request ComputationalRadiationPhysics#85 from psychocoderHPC/topic-cuplaStreamQuerySupport
5d19923 update documentation of `cuplaGetLastError`
3806b8f implement `cuplaPeekAtLastError()`
2e79816 add `cuplaStreamQuery()`
7c73dc8 Merge pull request ComputationalRadiationPhysics#83 from psychocoderHPC/fix-cuplaGetLastError
b02299a fix `cuplaGetLastError`
1b7d7ea Merge pull request ComputationalRadiationPhysics#81 from tdd11235813/master
b0adfd9 Updates alpaka to 0.3.5.

git-subtree-dir: thirdParty/cupla
git-subtree-split: a96b293dcb14662a57901b55dfedaa1cd615adc9
psychocoderHPC pushed a commit to psychocoderHPC/picongpu that referenced this pull request May 17, 2019
a96b293 Merge pull request ComputationalRadiationPhysics#106 from fwyzard/cupla_accelerator_namespace
1af2b2b Merge pull request ComputationalRadiationPhysics#110 from tdd11235813/cmake-macro
663521c Changes function to macro 'CUPLA_ADD_EXECUTABLE'.
a440a7c Fix namespace definition if two accelerators are selected
64f02bb Move all accelerator-specific code to an inline namespece
bbef699 Merge pull request ComputationalRadiationPhysics#105 from fwyzard/tbb_IsThreadSeqAcc
b463a25 Mark the TBB backend as "thread sequential"
b45d4e9 Merge pull request ComputationalRadiationPhysics#102 from psychocoderHPC/topic-updateToLatestAlapkaDev
7e8b832 createTaskExec -> createTaskKernel
84b6dc1 update to latest alapka develop branch
037f7b2 Merge pull request ComputationalRadiationPhysics#100 from DerWaldschrat/dev
7add5ed fix -Wreorder in cuplaPitchedPtr (#4)
9fa745b Merge pull request ComputationalRadiationPhysics#99 from ax3l/topic-cmake312rootHints
041d454 Merge pull request ComputationalRadiationPhysics#98 from DerWaldschrat/dev-fix
ecc5839 CMake: Honor _ROOT Env Hints
24d159a Added conditional check for backends.
5822555 Add cudaEventBlockingSync to event creation
906cd41 Merge pull request ComputationalRadiationPhysics#97 from psychocoderHPC/topic-HIPBackend
bc67259 alpaka backend: HIP
87fe58d Merge pull request ComputationalRadiationPhysics#96 from psychocoderHPC/fix-kernelSharedMemCalc
68877b5 fix dynamic shared mem definition
9452a70 Merge pull request ComputationalRadiationPhysics#95 from psychocoderHPC/topic-updateDocs
8b26918 update docs
e822bfa Merge pull request ComputationalRadiationPhysics#89 from psychocoderHPC/topic-switchToAlpakaDevelop0.4.X
50cedbc alpaka renamings + cmake version incerase
5ecd227 update to alapka dev upcoming version 0.4.X
66a9240 Merge pull request ComputationalRadiationPhysics#94 from psychocoderHPC/topic-ciUpdateToCUDA8
3ba6104 CI: update CUDA from 7.5 to 8.0
5af56ce Merge pull request ComputationalRadiationPhysics#93 from psychocoderHPC/topic-updateCIToClang4
68a6555 Travis: CUDA Compiler Ignore
279bfd0 Travis: Xenial
9d583b7 CI: switch from clan 3.5 to 4.0
11eb874 Merge pull request ComputationalRadiationPhysics#92 from ax3l/topic-ciCMake3110
da617da Travis: CMake 3.11.0
da63524 Merge pull request ComputationalRadiationPhysics#91 from ComputationalRadiationPhysics/dev
66a2da7 Merge pull request ComputationalRadiationPhysics#88 from psychocoderHPC/topic-versionIncreaseTo0.1.1
e029584 version increase to 0.1.1
ffdb268 Merge pull request ComputationalRadiationPhysics#90 from psychocoderHPC/fix-tbbSelection
06030af fix TBB backend activation
aa8a921 Merge pull request ComputationalRadiationPhysics#84 from psychocoderHPC/topic-cuplaGetErrorString
55c99b7 add implementation for `cuplaGetErrorString`
c765052 Merge pull request ComputationalRadiationPhysics#86 from psychocoderHPC/topic-cuplaPeekAtLastError
49612bb Merge pull request ComputationalRadiationPhysics#87 from psychocoderHPC/topic-helpUpdatecuplaGetLastError
c763de4 Merge pull request ComputationalRadiationPhysics#85 from psychocoderHPC/topic-cuplaStreamQuerySupport
5d19923 update documentation of `cuplaGetLastError`
3806b8f implement `cuplaPeekAtLastError()`
2e79816 add `cuplaStreamQuery()`
7c73dc8 Merge pull request ComputationalRadiationPhysics#83 from psychocoderHPC/fix-cuplaGetLastError
b02299a fix `cuplaGetLastError`
1b7d7ea Merge pull request ComputationalRadiationPhysics#81 from tdd11235813/master
b0adfd9 Updates alpaka to 0.3.5.

git-subtree-dir: thirdParty/cupla
git-subtree-split: a96b293dcb14662a57901b55dfedaa1cd615adc9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants