ci: activate lvarray bound checks on ci. (#344)

CusiniM · corbett5 · rrsettgast · web-flow · commit 5009bf7cdda0 · 2025-02-19T15:41:54.000-08:00
* Made some sorted error checks associated with bounds checking.

* ci: activate lvarray bound checks on ci.

* add set for release.

---------

Co-authored-by: Benjamin Curtice Corbett &lt;corbett5@llnl.gov&gt;
Co-authored-by: Randolph Settgast &lt;settgast1@llnl.gov&gt;
diff --git a/cmake/CMakeBasics.cmake b/cmake/CMakeBasics.cmake
@@ -1,12 +1,12 @@
 set(CMAKE_ENABLE_EXPORTS ON)
+option( LVARRAY_BOUNDS_CHECK "Enable bounds checking in LvArray" OFF )
 
 if( CMAKE_BUILD_TYPE MATCHES "Debug" )
-  option( LVARRAY_BOUNDS_CHECK "" ON )
+  set( LVARRAY_BOUNDS_CHECK ON CACHE BOOL "")
 else()
-  option( LVARRAY_BOUNDS_CHECK "" OFF )
+  set( LVARRAY_BOUNDS_CHECK OFF CACHE BOOL "")
 endif()
 
-
 option( ENABLE_TOTALVIEW_OUTPUT "" OFF )
 
 set( LVARRAY_BUILD_OBJ_LIBS OFF CACHE BOOL "" )
diff --git a/src/sortedArrayManipulation.hpp b/src/sortedArrayManipulation.hpp
@@ -306,7 +306,9 @@ template< typename ITER, typename Compare=less< typename std::iterator_traits< I
 LVARRAY_HOST_DEVICE inline
 std::ptrdiff_t removeDuplicates( ITER first, ITER const last, Compare && comp=Compare() )
 {
-  LVARRAY_ASSERT( isSorted( first, last, comp ) );
+#ifdef LVARRAY_BOUNDS_CHECK
+  LVARRAY_ERROR_IF( !isSorted( first, last, comp ), "Input needs to be sorted" );
+#endif
 
   if( first == last )
   {
@@ -520,7 +522,9 @@ std::ptrdiff_t remove( T * const LVARRAY_RESTRICT ptr,
   LVARRAY_ASSERT( arrayManipulation::isPositive( size ) );
   LVARRAY_ASSERT( isSortedUnique( ptr, ptr + size ) );
 
-  LVARRAY_ASSERT( isSortedUnique( first, last ) );
+#ifdef LVARRAY_BOUNDS_CHECK
+  LVARRAY_ERROR_IF( !isSortedUnique( first, last ), "Input needs to be unique and sorted." );
+#endif
 
   // Find the position of the first value to remove and the position it's at in the array.
   ITER valueToRemove = first;
@@ -683,7 +687,9 @@ std::ptrdiff_t insert( T * const LVARRAY_RESTRICT ptr,
   LVARRAY_ASSERT( arrayManipulation::isPositive( size ) );
   LVARRAY_ASSERT( isSortedUnique( ptr, ptr + size ) );
 
-  LVARRAY_ASSERT( isSortedUnique( first, last ) );
+#ifdef LVARRAY_BOUNDS_CHECK
+  LVARRAY_ERROR_IF( !isSortedUnique( first, last ), "Input needs to be unique and sorted." );
+#endif
 
   // Special case for inserting into an empty array.
   if( size == 0 )
