Merge branch 'feature/operation-v2' of github.com:LLNL/Umpire into device-memset-operation

Author: kab163

src/umpire/DeviceAllocator.cpp

@@ -27,7 +27,7 @@ __host__ DeviceAllocator::DeviceAllocator(Allocator allocator, size_t size, cons
   auto device_alloc = rm.getAllocator("UM");
 
   m_counter = static_cast<unsigned int*>(device_alloc.allocate(sizeof(unsigned int)));
-  umpire::memset(m_counter, 0);
+  umpire::memset(m_counter, 0, 1);
 
   // convert the string name to a char name
   const char* name = old_name.c_str();

tests/integration/interface/fortran/allocator_fortran_tests.F

@@ -1399,7 +1399,6 @@ end module umpire_fortran_generated_tests
 
 
 program fortran_test
-  use fruit
   use umpire_fortran_generated_tests
 
   implicit none

tests/integration/interface/fortran/introspection_fortran_tests.F

@@ -51,7 +51,6 @@ end subroutine test_introspection
 end module umpire_fortran_introspection_tests
 
 program fortran_test
-  use fruit
   use umpire_fortran_introspection_tests
 
   implicit none

tests/integration/interface/fortran/op_fortran_tests.F

@@ -51,7 +51,6 @@ end module umpire_fortran_op_tests
 
 
 program fortran_test
-  use fruit
   use umpire_fortran_op_tests
 
   implicit none

tests/integration/interface/fortran/version_fortran_tests.F

@@ -32,7 +32,6 @@ end subroutine test_version
 end module umpire_fortran_version_tests
 
 program fortran_test
-  use fruit
   use umpire_fortran_version_tests
 
   implicit none