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.

Sign up for GitHub

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

Squash compiler warnings that appear in various CI checks #1796

Merged
merged 4 commits into from
Feb 27, 2025
Merged

Squash compiler warnings that appear in various CI checks #1796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb8dad9
Pull in camp changes to squash sycl compiler warnings
rhornung67 Feb 24, 2025
278d24c
Adjust types, removed unused, etc. to squash compiler warnings
rhornung67 Feb 24, 2025
59adff8
Squash more warnings
rhornung67 Feb 24, 2025
75333e8
Run clang-format
rhornung67 Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/RAJA/policy/sycl/forall.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ forall_impl(resources::Sycl& sycl_res,
ForallParam)
{

using Iterator = camp::decay<decltype(std::begin(iter))>;
using LOOP_BODY = camp::decay<LoopBody>;
using Iterator = camp::decay<decltype(std::begin(iter))>;
using IndexType =
camp::decay<decltype(std::distance(std::begin(iter), std::end(iter)))>;

Expand Down Expand Up @@ -247,8 +246,7 @@ forall_impl(resources::Sycl& sycl_res,
ForallParam f_params)

{
using Iterator = camp::decay<decltype(std::begin(iter))>;
using LOOP_BODY = camp::decay<LoopBody>;
using Iterator = camp::decay<decltype(std::begin(iter))>;
using IndexType =
camp::decay<decltype(std::distance(std::begin(iter), std::end(iter)))>;
using EXEC_POL = camp::decay<decltype(pol)>;
Expand All @@ -271,6 +269,7 @@ forall_impl(resources::Sycl& sycl_res,
//
sycl_dim_t blockSize {BlockSize};
sycl_dim_t gridSize = impl::getGridDim(static_cast<size_t>(len), BlockSize);
RAJA_UNUSED_VAR(gridSize);

::sycl::queue* q = sycl_res.get_queue();

Expand Down Expand Up @@ -348,6 +347,7 @@ forall_impl(resources::Sycl& sycl_res,
//
sycl_dim_t blockSize {BlockSize};
sycl_dim_t gridSize = impl::getGridDim(static_cast<size_t>(len), BlockSize);
RAJA_UNUSED_VAR(gridSize);

::sycl::queue* q = sycl_res.get_queue();

Expand Down
2 changes: 1 addition & 1 deletion include/RAJA/policy/sycl/kernel/Lambda.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct SyclStatementExecutor<Data,
{

static inline RAJA_DEVICE void exec(Data& data,
::sycl::nd_item<3> item,
::sycl::nd_item<3> RAJA_UNUSED_ARG(item),
bool thread_active)
{
// Only execute the lambda if it hasn't been masked off
Expand Down
4 changes: 2 additions & 2 deletions include/RAJA/policy/sycl/kernel/SyclKernel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ struct SyclLaunchHelper<false, sycl_launch<async0>, StmtList, Data, Types>

static void launch(Data&& data,
internal::LaunchDims launch_dims,
size_t shmem,
size_t RAJA_UNUSED_ARG(shmem),
::sycl::queue* qu)
{

Expand Down Expand Up @@ -169,7 +169,7 @@ struct SyclLaunchHelper<true, sycl_launch<async0>, StmtList, Data, Types>

static void launch(Data&& data,
internal::LaunchDims launch_dims,
size_t shmem,
size_t RAJA_UNUSED_ARG(shmem),
::sycl::queue* qu)
{

Expand Down
6 changes: 4 additions & 2 deletions include/RAJA/policy/sycl/kernel/internal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ struct LaunchDims
// Prefer larger z -> y -> x
if (launch_local.x * launch_local.y * launch_local.z > max_work_group_size)
{
int remaining = 1;
unsigned long remaining = 1;
// local z cannot be > max_wrk from above
// if equal then remaining is 1, on handle <
if (max_work_group_size > launch_local.z)
Expand Down Expand Up @@ -236,7 +236,9 @@ struct SyclStatementListExecutorHelper<num_stmts, num_stmts, StmtList>
{

template<typename Data>
inline static RAJA_DEVICE void exec(Data&, ::sycl::nd_item<3> item, bool)
inline static RAJA_DEVICE void exec(Data&,
::sycl::nd_item<3> RAJA_UNUSED_ARG(item),
bool)
{
// nop terminator
}
Expand Down
12 changes: 6 additions & 6 deletions include/RAJA/policy/sycl/launch.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
params.threads.value[0] * params.teams.value[0]);

// Only launch kernel if we have something to iterate over
constexpr size_t zero = 0;
constexpr int zero = 0;
if (params.threads.value[0] > zero && params.threads.value[1] > zero &&
params.threads.value[2] > zero && params.teams.value[0] > zero &&
params.teams.value[1] > zero && params.teams.value[2] > zero)
Expand Down Expand Up @@ -139,7 +139,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
launch_params.threads.value[0] * launch_params.teams.value[0]);

// Only launch kernel if we have something to iterate over
constexpr size_t zero = 0;
constexpr int zero = 0;
if (launch_params.threads.value[0] > zero &&
launch_params.threads.value[1] > zero &&
launch_params.threads.value[2] > zero &&
Expand Down Expand Up @@ -206,7 +206,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
RAJA::expt::type_traits::is_ForallParamPack_empty<ReduceParams>>
exec(RAJA::resources::Resource res,
const LaunchParams& params,
const char* kernel_name,
const char* RAJA_UNUSED_ARG(kernel_name),
BODY_IN&& body_in,
ReduceParams& RAJA_UNUSED_ARG(launch_reducers))
{
Expand All @@ -228,7 +228,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
params.threads.value[0] * params.teams.value[0]);

// Only launch kernel if we have something to iterate over
constexpr size_t zero = 0;
constexpr int zero = 0;
if (params.threads.value[0] > zero && params.threads.value[1] > zero &&
params.threads.value[2] > zero && params.teams.value[0] > zero &&
params.teams.value[1] > zero && params.teams.value[2] > zero)
Expand Down Expand Up @@ -283,7 +283,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
RAJA::expt::type_traits::is_ForallParamPack_empty<ReduceParams>>>
exec(RAJA::resources::Resource res,
const LaunchParams& launch_params,
const char* kernel_name,
const char* RAJA_UNUSED_ARG(kernel_name),
BODY_IN&& body_in,
ReduceParams launch_reducers)
{
Expand All @@ -308,7 +308,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
launch_params.threads.value[0] * launch_params.teams.value[0]);

// Only launch kernel if we have something to iterate over
constexpr size_t zero = 0;
constexpr int zero = 0;
if (launch_params.threads.value[0] > zero &&
launch_params.threads.value[1] > zero &&
launch_params.threads.value[2] > zero &&
Expand Down
10 changes: 5 additions & 5 deletions include/RAJA/policy/sycl/reduce.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ struct Reduce_Data
Reduce_Data(const Reduce_Data&) = default;

//! transfers from the host to the device -- exit() is called upon failure
RAJA_INLINE void hostToDevice(Offload_Info& info)
RAJA_INLINE void hostToDevice(Offload_Info& RAJA_UNUSED_ARG(info))
{
::sycl::queue* q = ::camp::resources::Sycl::get_default().get_queue();

Expand All @@ -159,7 +159,7 @@ struct Reduce_Data
}

//! transfers from the device to the host -- exit() is called upon failure
RAJA_INLINE void deviceToHost(Offload_Info& info)
RAJA_INLINE void deviceToHost(Offload_Info& RAJA_UNUSED_ARG(info))
{
::sycl::queue* q = ::camp::resources::Sycl::get_default().get_queue();

Expand All @@ -178,7 +178,7 @@ struct Reduce_Data
}

//! frees all data from the offload information passed
RAJA_INLINE void cleanup(Offload_Info& info)
RAJA_INLINE void cleanup(Offload_Info& RAJA_UNUSED_ARG(info))
{
::sycl::queue* q = ::camp::resources::Sycl::get_default().get_queue();

Expand Down Expand Up @@ -207,8 +207,8 @@ struct TargetReduce
TargetReduce(const TargetReduce&) = default;

explicit TargetReduce(T init_val)
: info(),
val(Reducer::identity(), Reducer::identity(), info),
: val(Reducer::identity(), Reducer::identity(), info),
info(),
initVal(init_val),
finalVal(Reducer::identity())
{}
Expand Down
2 changes: 1 addition & 1 deletion tpl/camp
Open in desktop
Submodule camp updated 81 files
+42 −0 .readthedocs.yml
+13 −1 CMakeLists.txt
+2 −2 Dockerfile
+6 −4 LICENSE
+2 −2 LLVM_LICENSE
+19 −3 README.md
+17 −0 cmake/FindSphinx.cmake
+7 −0 cmake/campConfig.cmake.in
+7 −0 cmake/load_blt.cmake
+22 −0 docs/CMakeLists.txt
+265 −124 docs/conf.py
+26 −0 docs/doxygen/CMakeLists.txt
+2,389 −0 docs/doxygen/Doxyfile
+2,390 −0 docs/doxygen/Doxyfile.in
+58 −3 docs/index.rst
+2 −1 docs/requirements.txt
+32 −0 docs/sphinx/camp_license.rst
+142 −0 docs/sphinx/dev_guide/index.rst
+198 −0 docs/sphinx/user_guide/feature/array.rst
+277 −0 docs/sphinx/user_guide/feature/list.rst
+46 −0 docs/sphinx/user_guide/feature/number.rst
+173 −0 docs/sphinx/user_guide/feature/resource.rst
+127 −0 docs/sphinx/user_guide/feature/tuple.rst
+29 −0 docs/sphinx/user_guide/features.rst
+81 −0 docs/sphinx/user_guide/getting_started.rst
+21 −0 docs/sphinx/user_guide/index.rst
+179 −0 docs/sphinx/user_guide/using_camp.rst
+24 −23 include/camp/array.hpp
+6 −9 include/camp/camp.hpp
+6 −9 include/camp/concepts.hpp
+7 −0 include/camp/config.in.hpp
+8 −9 include/camp/defines.hpp
+6 −9 include/camp/detail/sfinae.hpp
+6 −9 include/camp/detail/test.hpp
+6 −9 include/camp/helpers.hpp
+6 −9 include/camp/lambda.hpp
+6 −9 include/camp/list.hpp
+6 −9 include/camp/list/at.hpp
+6 −9 include/camp/list/find_if.hpp
+6 −9 include/camp/list/list.hpp
+7 −9 include/camp/make_unique.hpp
+6 −9 include/camp/map.hpp
+6 −9 include/camp/number.hpp
+6 −9 include/camp/number/if.hpp
+6 −9 include/camp/number/number.hpp
+6 −9 include/camp/resource.hpp
+6 −9 include/camp/resource/cuda.hpp
+6 −9 include/camp/resource/event.hpp
+6 −9 include/camp/resource/hip.hpp
+6 −9 include/camp/resource/host.hpp
+6 −9 include/camp/resource/omp_target.hpp
+6 −9 include/camp/resource/platform.hpp
+13 −11 include/camp/resource/sycl.hpp
+6 −9 include/camp/size.hpp
+6 −9 include/camp/tuple.hpp
+6 −9 include/camp/type_traits.hpp
+6 −9 include/camp/type_traits/is_same.hpp
+6 −9 include/camp/value.hpp
+6 −9 include/camp/value/eval.hpp
+8 −0 scripts/gen-header-list.sh
+7 −0 scripts/get-deps.sh
+8 −0 scripts/get-llvm.sh
+2 −2 scripts/make_release_tarball.sh
+67 −0 scripts/update_copyright.sh
+ − share/camp/logo/camp2-gradient.png
+7 −0 src/errors.cpp
+7 −0 test/CMakeLists.txt
+7 −0 test/Test.hpp
+7 −0 test/accumulate.cpp
+7 −0 test/array.cpp
+7 −0 test/at_key.cpp
+7 −0 test/filter.cpp
+7 −0 test/find_if.cpp
+7 −0 test/flatten.cpp
+7 −0 test/index_of.cpp
+7 −0 test/lambda.cpp
+7 −0 test/number.cpp
+3 −11 test/resource.cpp
+7 −0 test/size.cpp
+7 −0 test/transform.cpp
+3 −11 test/tuple.cpp