Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions cmake/SetupRajaConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ endif()
#set(RAJA_USE_PTR_CLASS OFF)

## Fault tolerance options
option(RAJA_ENABLE_FT "Enable fault-tolerance features" OFF)
option(RAJA_REPORT_FT "Report on use of fault-tolerant features" OFF)
option(RAJA_ENABLE_ITERATOR_OVERFLOW_DEBUG "Enable Overflow checking during Iterator operations" OFF)

## Timer options
Expand Down
19 changes: 0 additions & 19 deletions docs/sphinx/user_guide/config_options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -335,25 +335,6 @@ in units of **bytes**.
For details on the options in this section are used, please see the
header file ``RAJA/include/RAJA/util/types.hpp``.

Other RAJA Features
-------------------

RAJA contains some features that are used mainly for development or may
not be of general interest to RAJA users. These are turned off be default.
They are described here for reference and completeness.

=========================== =======================================
Variable Meaning
=========================== =======================================
RAJA_ENABLE_FT Enable/disable RAJA experimental
loop-level fault-tolerance mechanism
RAJA_REPORT_FT Enable/disable a report of fault-
tolerance enabled run (e.g., number of
faults detected, recovered from,
recovery overhead, etc.)
=========================== =======================================


.. _configopt-raja-backends-label:

===============================
Expand Down
7 changes: 3 additions & 4 deletions include/RAJA/config.hpp.in
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ static_assert(RAJA_HAS_SOME_CXX14,
*
******************************************************************************
*/
#cmakedefine RAJA_ENABLE_FT
#cmakedefine RAJA_ENABLE_ITERATOR_OVERFLOW_DEBUG
/*!
******************************************************************************
Expand Down Expand Up @@ -172,7 +171,7 @@ static_assert(RAJA_HAS_SOME_CXX14,
* indicate if the back-end is present when the application/library
* using RAJA is compiled. An application/library can use a subset of
* back-ends that are present in a RAJA install.
*
*
******************************************************************************
*/

Expand Down Expand Up @@ -271,8 +270,8 @@ namespace RAJA {

#if defined(RAJA_ENABLE_OPENMP) && !defined(__HIP_DEVICE_COMPILE__)
#if defined(_OPENMP)
// RAJA build can be configured but downstream packages may not; guard OpenMP
#define RAJA_OPENMP_ACTIVE
// RAJA build can be configured but downstream packages may not; guard OpenMP
#define RAJA_OPENMP_ACTIVE
#if (_OPENMP >= 200805)
#if defined(RAJA_ENABLE_OPENMP_TASK)
#define RAJA_ENABLE_OPENMP_TASK_INTERNAL
Expand Down
117 changes: 0 additions & 117 deletions include/RAJA/internal/fault_tolerance.hpp

This file was deleted.

2 changes: 0 additions & 2 deletions include/RAJA/pattern/forall.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@
#include "RAJA/index/ListSegment.hpp"
#include "RAJA/index/RangeSegment.hpp"

#include "RAJA/internal/fault_tolerance.hpp"

#include "RAJA/util/concepts.hpp"
#include "RAJA/util/Span.hpp"
#include "RAJA/util/types.hpp"
Expand Down
3 changes: 0 additions & 3 deletions include/RAJA/policy/cuda/WorkGroup/WorkRunner.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,6 @@ struct WorkRunner<
block_size),
static_cast<cuda_dim_member_t>(num_loops), 1};

RAJA_FT_BEGIN;

//
// Setup shared memory buffers
Expand All @@ -392,8 +391,6 @@ struct WorkRunner<
RAJA::cuda::launch((const void*)func, gridSize, blockSize, func_args,
shmem, r, Async);
}

RAJA_FT_END;
}

return run_storage;
Expand Down
5 changes: 0 additions & 5 deletions include/RAJA/policy/cuda/forall.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
#include "RAJA/util/macros.hpp"
#include "RAJA/util/types.hpp"

#include "RAJA/internal/fault_tolerance.hpp"

#include "RAJA/policy/cuda/MemUtils_CUDA.hpp"
#include "RAJA/policy/cuda/policy.hpp"
#include "RAJA/policy/cuda/raja_cudaerrchk.hpp"
Expand Down Expand Up @@ -570,7 +568,6 @@ forall_impl(resources::Cuda cuda_res,
internal::CudaDims dims(1);
DimensionCalculator::set_dimensions(dims, len, func, shmem);

RAJA_FT_BEGIN;

RAJA::cuda::detail::cudaInfo launch_info;
launch_info.gridDim = dims.blocks;
Expand Down Expand Up @@ -598,8 +595,6 @@ forall_impl(resources::Cuda cuda_res,
RAJA::expt::ParamMultiplexer::parampack_resolve(pol, f_params,
launch_info);
}

RAJA_FT_END;
}

return resources::EventProxy<resources::Cuda>(cuda_res);
Expand Down
6 changes: 0 additions & 6 deletions include/RAJA/policy/cuda/launch.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ struct LaunchExecute<
blockSize.x > zero && blockSize.y > zero && blockSize.z > zero)
{

RAJA_FT_BEGIN;

size_t shared_mem_size = launch_params.shared_mem_size;
RAJA::cuda::detail::cudaInfo launch_info;
Expand Down Expand Up @@ -126,8 +125,6 @@ struct LaunchExecute<
RAJA::expt::ParamMultiplexer::parampack_resolve(pol, launch_reducers,
launch_info);
}

RAJA_FT_END;
}

return resources::EventProxy<resources::Resource>(res);
Expand Down Expand Up @@ -207,7 +204,6 @@ struct LaunchExecute<
blockSize.x > zero && blockSize.y > zero && blockSize.z > zero)
{

RAJA_FT_BEGIN;

size_t shared_mem_size = launch_params.shared_mem_size;
RAJA::cuda::detail::cudaInfo launch_info;
Expand Down Expand Up @@ -237,8 +233,6 @@ struct LaunchExecute<
RAJA::expt::ParamMultiplexer::parampack_resolve(pol, launch_reducers,
launch_info);
}

RAJA_FT_END;
}

return resources::EventProxy<resources::Resource>(res);
Expand Down
3 changes: 0 additions & 3 deletions include/RAJA/policy/hip/WorkGroup/WorkRunner.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,6 @@ struct WorkRunner<
block_size),
static_cast<hip_dim_member_t>(num_loops), 1};

RAJA_FT_BEGIN;

//
// Setup shared memory buffers
Expand All @@ -379,8 +378,6 @@ struct WorkRunner<
RAJA::hip::launch((const void*)func, gridSize, blockSize, func_args,
shmem, r, Async);
}

RAJA_FT_END;
}

return run_storage;
Expand Down
5 changes: 0 additions & 5 deletions include/RAJA/policy/hip/forall.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
#include "RAJA/util/macros.hpp"
#include "RAJA/util/types.hpp"

#include "RAJA/internal/fault_tolerance.hpp"

#include "RAJA/policy/hip/MemUtils_HIP.hpp"
#include "RAJA/policy/hip/policy.hpp"
#include "RAJA/policy/hip/raja_hiperrchk.hpp"
Expand Down Expand Up @@ -552,7 +550,6 @@ forall_impl(resources::Hip hip_res,
internal::HipDims dims(1);
DimensionCalculator::set_dimensions(dims, len, func, shmem);

RAJA_FT_BEGIN;

RAJA::hip::detail::hipInfo launch_info;
launch_info.gridDim = dims.blocks;
Expand Down Expand Up @@ -580,8 +577,6 @@ forall_impl(resources::Hip hip_res,
RAJA::expt::ParamMultiplexer::parampack_resolve(pol, f_params,
launch_info);
}

RAJA_FT_END;
}

return resources::EventProxy<resources::Hip>(hip_res);
Expand Down
6 changes: 0 additions & 6 deletions include/RAJA/policy/hip/launch.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ struct LaunchExecute<
blockSize.x > zero && blockSize.y > zero && blockSize.z > zero)
{

RAJA_FT_BEGIN;

size_t shared_mem_size = launch_params.shared_mem_size;
RAJA::hip::detail::hipInfo launch_info;
Expand Down Expand Up @@ -124,8 +123,6 @@ struct LaunchExecute<
RAJA::expt::ParamMultiplexer::parampack_resolve(pol, launch_reducers,
launch_info);
}

RAJA_FT_END;
}

return resources::EventProxy<resources::Resource>(res);
Expand Down Expand Up @@ -200,7 +197,6 @@ struct LaunchExecute<RAJA::policy::hip::hip_launch_t<async, nthreads>>
blockSize.x > zero && blockSize.y > zero && blockSize.z > zero)
{

RAJA_FT_BEGIN;

size_t shared_mem_size = launch_params.shared_mem_size;
RAJA::hip::detail::hipInfo launch_info;
Expand Down Expand Up @@ -231,8 +227,6 @@ struct LaunchExecute<RAJA::policy::hip::hip_launch_t<async, nthreads>>
RAJA::expt::ParamMultiplexer::parampack_resolve(pol, launch_reducers,
launch_info);
}

RAJA_FT_END;
}

return resources::EventProxy<resources::Resource>(res);
Expand Down
2 changes: 0 additions & 2 deletions include/RAJA/policy/openmp/forall.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
#include <omp.h>

#include "RAJA/util/types.hpp"

#include "RAJA/internal/fault_tolerance.hpp"
#include "RAJA/pattern/kernel/TypeTraits.hpp"

#include "RAJA/index/IndexSet.hpp"
Expand Down
2 changes: 0 additions & 2 deletions include/RAJA/policy/sequential/forall.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@

#include "RAJA/policy/sequential/policy.hpp"

#include "RAJA/internal/fault_tolerance.hpp"

#include "RAJA/pattern/detail/forall.hpp"

#include "RAJA/util/resource.hpp"
Expand Down
2 changes: 0 additions & 2 deletions include/RAJA/policy/simd/forall.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@

#include "RAJA/util/types.hpp"

#include "RAJA/internal/fault_tolerance.hpp"

#include "RAJA/policy/simd/policy.hpp"

#include "RAJA/pattern/params/forall.hpp"
Expand Down
2 changes: 0 additions & 2 deletions include/RAJA/policy/sycl/forall.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
#include "RAJA/util/macros.hpp"
#include "RAJA/util/types.hpp"

#include "RAJA/internal/fault_tolerance.hpp"

#include "RAJA/policy/sycl/MemUtils_SYCL.hpp"
#include "RAJA/policy/sycl/policy.hpp"

Expand Down
4 changes: 0 additions & 4 deletions include/RAJA/policy/sycl/launch.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
}


RAJA_FT_BEGIN;

using LOOP_BODY = camp::decay<LoopBody>;
LOOP_BODY* lbody = nullptr;
//
Expand Down Expand Up @@ -176,8 +174,6 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
q->wait();
}
}
RAJA_FT_END;


return resources::EventProxy<resources::Resource>(res);
}
Expand Down