Commit dd67989c authored by Steve Plimpton's avatar Steve Plimpton Committed by GitHub
Browse files

Merge pull request #601 from stanmoore1/kokkos_update 

Update Kokkos library to v2.03.13
parents 00aafef1 8a7a831b

lib/kokkos/CHANGELOG.md

+41 −0
Original line number Diff line number Diff line 
# Change Log



## [2.03.13](https://github.com/kokkos/kokkos/tree/2.03.13) (2017-07-27)

[Full Changelog](https://github.com/kokkos/kokkos/compare/2.03.05...2.03.13)



**Implemented enhancements:**



- Disallow enabling both OpenMP and Threads in the same executable [\#406](https://github.com/kokkos/kokkos/issues/406)

- Make Kokkos::OpenMP respect OMP environment even if hwloc is available [\#630](https://github.com/kokkos/kokkos/issues/630)

- Improve Atomics Performance on KNL/Broadwell where PREFETCHW/RFO is Available [\#898](https://github.com/kokkos/kokkos/issues/898)

- Kokkos::resize should test whether dimensions have changed before resizing [\#904](https://github.com/kokkos/kokkos/issues/904)

- Develop performance-regression/acceptance tests [\#737](https://github.com/kokkos/kokkos/issues/737)

- Make the deep\_copy Profiling hook a start/end system [\#890](https://github.com/kokkos/kokkos/issues/890)

- Add deep\_copy Profiling hook [\#843](https://github.com/kokkos/kokkos/issues/843)

- Append tag name to parallel construct name for Profiling [\#842](https://github.com/kokkos/kokkos/issues/842)

- Add view label to `View bounds error` message for CUDA backend [\#870](https://github.com/kokkos/kokkos/issues/870)

- Disable printing the loaded profiling library [\#824](https://github.com/kokkos/kokkos/issues/824)

- "Declared but never referenced" warnings [\#853](https://github.com/kokkos/kokkos/issues/853)

- Warnings about lock\_address\_cuda\_space [\#852](https://github.com/kokkos/kokkos/issues/852)

- WorkGraph execution policy [\#771](https://github.com/kokkos/kokkos/issues/771)

- Simplify makefiles by guarding compilation with appropriate KOKKOS\_ENABLE\_\#\#\# macros [\#716](https://github.com/kokkos/kokkos/issues/716)

- Cmake build: wrong include install directory [\#668](https://github.com/kokkos/kokkos/issues/668)

- Derived View type and allocation [\#566](https://github.com/kokkos/kokkos/issues/566)

- Fix Compiler warnings when compiling core unit tests for Cuda [\#214](https://github.com/kokkos/kokkos/issues/214)



**Fixed bugs:**



- Out-of-bounds read in Kokkos\_Layout.hpp [\#975](https://github.com/kokkos/kokkos/issues/975)

- CudaClang: Fix failing test with Clang 4.0 [\#941](https://github.com/kokkos/kokkos/issues/941)

- Respawn when memory pool allocation fails \(not available memory\) [\#940](https://github.com/kokkos/kokkos/issues/940)

- Memory pool aborts on zero allocation request, returns NULL for \< minimum [\#939](https://github.com/kokkos/kokkos/issues/939)

- Error with TaskScheduler query of underlying memory pool [\#917](https://github.com/kokkos/kokkos/issues/917)

- Profiling::\*Callee static variables declared in header [\#863](https://github.com/kokkos/kokkos/issues/863)

- calling \*Space::name\(\) causes compile error [\#862](https://github.com/kokkos/kokkos/issues/862)

- bug in Profiling::deallocateData [\#860](https://github.com/kokkos/kokkos/issues/860)

- task\_depend test failing, CUDA 8.0 + Pascal + RDC [\#829](https://github.com/kokkos/kokkos/issues/829)

- \[develop branch\] Standalone cmake issues [\#826](https://github.com/kokkos/kokkos/issues/826)

- Kokkos CUDA failes to compile with OMPI\_CXX and MPICH\_CXX wrappers [\#776](https://github.com/kokkos/kokkos/issues/776)

- Task Team reduction on Pascal [\#767](https://github.com/kokkos/kokkos/issues/767)

- CUDA stack overflow with TaskDAG test [\#758](https://github.com/kokkos/kokkos/issues/758)

- TeamVector test on Cuda [\#670](https://github.com/kokkos/kokkos/issues/670)

- Clang 4.0 Cuda Build broken again [\#560](https://github.com/kokkos/kokkos/issues/560)





## [2.03.05](https://github.com/kokkos/kokkos/tree/2.03.05) (2017-05-27)

[Full Changelog](https://github.com/kokkos/kokkos/compare/2.03.00...2.03.05)

lib/kokkos/Makefile.kokkos

+65 −12
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ KOKKOS_INTERNAL_USE_LIBRT := $(strip $(shell echo $(KOKKOS_USE_TPLS) | grep "lib 
KOKKOS_INTERNAL_USE_MEMKIND := $(strip $(shell echo $(KOKKOS_USE_TPLS) | grep "experimental_memkind" | wc -l))



# Check for advanced settings.

KOKKOS_INTERNAL_ENABLE_COMPILER_WARNINGS := $(strip $(shell echo $(KOKKOS_OPTIONS) | grep "compiler_warnings" | wc -l))

KOKKOS_INTERNAL_OPT_RANGE_AGGRESSIVE_VECTORIZATION := $(strip $(shell echo $(KOKKOS_OPTIONS) | grep "aggressive_vectorization" | wc -l))

KOKKOS_INTERNAL_DISABLE_PROFILING := $(strip $(shell echo $(KOKKOS_OPTIONS) | grep "disable_profiling" | wc -l))

KOKKOS_INTERNAL_DISABLE_DUALVIEW_MODIFY_CHECK := $(strip $(shell echo $(KOKKOS_OPTIONS) | grep "disable_dualview_modify_check" | wc -l))
@@ -78,14 +79,14 @@ KOKKOS_INTERNAL_COMPILER_PGI := $(strip $(shell $(CXX) --version 2 
KOKKOS_INTERNAL_COMPILER_XL          := $(strip $(shell $(CXX) -qversion       2>&1 | grep XL                  | wc -l))

KOKKOS_INTERNAL_COMPILER_CRAY        := $(strip $(shell $(CXX) -craype-verbose 2>&1 | grep "CC-"               | wc -l))

KOKKOS_INTERNAL_COMPILER_NVCC        := $(strip $(shell $(CXX) --version       2>&1 | grep nvcc                | wc -l))

KOKKOS_INTERNAL_COMPILER_CLANG       := $(strip $(shell $(CXX) --version       2>&1 | grep clang               | wc -l))

KOKKOS_INTERNAL_COMPILER_APPLE_CLANG := $(strip $(shell $(CXX) --version       2>&1 | grep "apple-darwin"      | wc -l))

ifneq ($(OMPI_CXX),)

  KOKKOS_INTERNAL_COMPILER_NVCC  := $(strip $(shell $(OMPI_CXX) --version   2>&1 | grep "nvcc" | wc -l))

  KOKKOS_INTERNAL_COMPILER_NVCC      := $(strip $(shell $(OMPI_CXX) --version       2>&1 | grep nvcc                | wc -l))

endif

ifneq ($(MPICH_CXX),)

  KOKKOS_INTERNAL_COMPILER_NVCC  := $(strip $(shell $(MPICH_CXX) --version  2>&1 | grep "nvcc" | wc -l))

  KOKKOS_INTERNAL_COMPILER_NVCC      := $(strip $(shell $(MPICH_CXX) --version       2>&1 | grep nvcc                | wc -l))

endif

KOKKOS_INTERNAL_COMPILER_CLANG       := $(strip $(shell $(CXX) --version       2>&1 | grep clang               | wc -l))

KOKKOS_INTERNAL_COMPILER_APPLE_CLANG := $(strip $(shell $(CXX) --version       2>&1 | grep "apple-darwin"      | wc -l))



ifeq ($(KOKKOS_INTERNAL_COMPILER_CLANG), 2)

  KOKKOS_INTERNAL_COMPILER_CLANG = 1
@@ -111,6 +112,36 @@ ifeq ($(KOKKOS_INTERNAL_COMPILER_CLANG), 1) 
  endif

endif



# Set compiler warnings flags.

ifeq ($(KOKKOS_INTERNAL_ENABLE_COMPILER_WARNINGS), 1)

  ifeq ($(KOKKOS_INTERNAL_COMPILER_PGI), 1)

    # TODO check if PGI accepts GNU style warnings

    KOKKOS_INTERNAL_COMPILER_WARNINGS =

  else

    ifeq ($(KOKKOS_INTERNAL_COMPILER_CLANG), 1)

      KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wuninitialized

    else

      ifeq ($(KOKKOS_INTERNAL_COMPILER_APPLE_CLANG), 1)

        KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wuninitialized

      else

        ifeq ($(KOKKOS_INTERNAL_COMPILER_XL), 1)

          KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wuninitialized

        else

          ifeq ($(KOKKOS_INTERNAL_COMPILER_CRAY), 1)

            # TODO check if cray accepts GNU style warnings

            KOKKOS_INTERNAL_COMPILER_WARNINGS =

          else

            #gcc

            KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wignored-qualifiers -Wempty-body -Wclobbered -Wuninitialized

          endif

        endif

      endif

    endif

  endif

else

  KOKKOS_INTERNAL_COMPILER_WARNINGS =

endif



# Set OpenMP flags.

ifeq ($(KOKKOS_INTERNAL_COMPILER_PGI), 1)

  KOKKOS_INTERNAL_OPENMP_FLAG := -mp
@@ -162,6 +193,7 @@ endif 


# Intel based.

KOKKOS_INTERNAL_USE_ARCH_KNC := $(strip $(shell echo $(KOKKOS_ARCH) | grep KNC | wc -l))

KOKKOS_INTERNAL_USE_ARCH_WSM := $(strip $(shell echo $(KOKKOS_ARCH) | grep WSM | wc -l))

KOKKOS_INTERNAL_USE_ARCH_SNB := $(strip $(shell echo $(KOKKOS_ARCH) | grep SNB | wc -l))

KOKKOS_INTERNAL_USE_ARCH_HSW := $(strip $(shell echo $(KOKKOS_ARCH) | grep HSW | wc -l))

KOKKOS_INTERNAL_USE_ARCH_BDW := $(strip $(shell echo $(KOKKOS_ARCH) | grep BDW | wc -l))
@@ -229,13 +261,14 @@ KOKKOS_INTERNAL_USE_ARCH_IBM := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_ 
KOKKOS_INTERNAL_USE_ARCH_AMDAVX := $(strip $(shell echo $(KOKKOS_ARCH) | grep AMDAVX | wc -l))



# Any AVX?

KOKKOS_INTERNAL_USE_ARCH_SSE42      := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_WSM) | bc ))

KOKKOS_INTERNAL_USE_ARCH_AVX        := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_SNB)+$(KOKKOS_INTERNAL_USE_ARCH_AMDAVX) | bc ))

KOKKOS_INTERNAL_USE_ARCH_AVX2       := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_HSW)+$(KOKKOS_INTERNAL_USE_ARCH_BDW) | bc ))

KOKKOS_INTERNAL_USE_ARCH_AVX512MIC  := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_KNL) | bc ))

KOKKOS_INTERNAL_USE_ARCH_AVX512XEON := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_SKX) | bc ))



# Decide what ISA level we are able to support.

KOKKOS_INTERNAL_USE_ISA_X86_64    := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_SNB)+$(KOKKOS_INTERNAL_USE_ARCH_HSW)+$(KOKKOS_INTERNAL_USE_ARCH_BDW)+$(KOKKOS_INTERNAL_USE_ARCH_KNL)+$(KOKKOS_INTERNAL_USE_ARCH_SKX) | bc ))

KOKKOS_INTERNAL_USE_ISA_X86_64    := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_WSM)+$(KOKKOS_INTERNAL_USE_ARCH_SNB)+$(KOKKOS_INTERNAL_USE_ARCH_HSW)+$(KOKKOS_INTERNAL_USE_ARCH_BDW)+$(KOKKOS_INTERNAL_USE_ARCH_KNL)+$(KOKKOS_INTERNAL_USE_ARCH_SKX) | bc ))

KOKKOS_INTERNAL_USE_ISA_KNC       := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_KNC) | bc ))

KOKKOS_INTERNAL_USE_ISA_POWERPCLE := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_POWER8)+$(KOKKOS_INTERNAL_USE_ARCH_POWER9) | bc ))
@@ -243,7 +276,7 @@ KOKKOS_INTERNAL_USE_ISA_POWERPCLE := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ 
KOKKOS_INTERNAL_USE_TM            := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_BDW)+$(KOKKOS_INTERNAL_USE_ARCH_SKX) | bc ))



# Incompatible flags?

KOKKOS_INTERNAL_USE_ARCH_MULTIHOST := $(strip $(shell echo "$(KOKKOS_INTERNAL_USE_ARCH_AVX)+$(KOKKOS_INTERNAL_USE_ARCH_AVX2)+$(KOKKOS_INTERNAL_USE_ARCH_AVX512MIC)+$(KOKKOS_INTERNAL_USE_ARCH_AVX512XEON)+$(KOKKOS_INTERNAL_USE_ARCH_KNC)+$(KOKKOS_INTERNAL_USE_ARCH_IBM)+$(KOKKOS_INTERNAL_USE_ARCH_ARM)>1" | bc ))

KOKKOS_INTERNAL_USE_ARCH_MULTIHOST := $(strip $(shell echo "$(KOKKOS_INTERNAL_USE_ARCH_SSE42)+$(KOKKOS_INTERNAL_USE_ARCH_AVX)+$(KOKKOS_INTERNAL_USE_ARCH_AVX2)+$(KOKKOS_INTERNAL_USE_ARCH_AVX512MIC)+$(KOKKOS_INTERNAL_USE_ARCH_AVX512XEON)+$(KOKKOS_INTERNAL_USE_ARCH_KNC)+$(KOKKOS_INTERNAL_USE_ARCH_IBM)+$(KOKKOS_INTERNAL_USE_ARCH_ARM)>1" | bc ))

KOKKOS_INTERNAL_USE_ARCH_MULTIGPU := $(strip $(shell echo "$(KOKKOS_INTERNAL_USE_ARCH_NVIDIA)>1" | bc))



ifeq ($(KOKKOS_INTERNAL_USE_ARCH_MULTIHOST), 1)
@@ -257,12 +290,10 @@ endif 


KOKKOS_CPPFLAGS = -I./ -I$(KOKKOS_PATH)/core/src -I$(KOKKOS_PATH)/containers/src -I$(KOKKOS_PATH)/algorithms/src



# No warnings:

KOKKOS_CXXFLAGS =

# INTEL and CLANG warnings:

#KOKKOS_CXXFLAGS = -Wall -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wuninitialized

# GCC warnings:

#KOKKOS_CXXFLAGS = -Wall -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wuninitialized -Wignored-qualifiers -Wempty-body -Wclobbered

ifeq ($(KOKKOS_INTERNAL_ENABLE_COMPILER_WARNINGS), 1)

  KOKKOS_CXXFLAGS += $(KOKKOS_INTERNAL_COMPILER_WARNINGS)

endif



KOKKOS_LIBS = -lkokkos -ldl

KOKKOS_LDFLAGS = -L$(shell pwd)
@@ -486,6 +517,28 @@ ifeq ($(KOKKOS_INTERNAL_USE_ARCH_ARMV8_THUNDERX), 1) 
  endif

endif



ifeq ($(KOKKOS_INTERNAL_USE_ARCH_SSE42), 1)

  tmp := $(shell echo "\#define KOKKOS_ARCH_SSE42 1" >> KokkosCore_config.tmp )



  ifeq ($(KOKKOS_INTERNAL_COMPILER_INTEL), 1)

    KOKKOS_CXXFLAGS += -xSSE4.2

    KOKKOS_LDFLAGS  += -xSSE4.2

  else

    ifeq ($(KOKKOS_INTERNAL_COMPILER_CRAY), 1)



    else

      ifeq ($(KOKKOS_INTERNAL_COMPILER_PGI), 1)

        KOKKOS_CXXFLAGS += -tp=nehalem

        KOKKOS_LDFLAGS  += -tp=nehalem

      else

        # Assume that this is a really a GNU compiler.

        KOKKOS_CXXFLAGS += -msse4.2

        KOKKOS_LDFLAGS  += -msse4.2

      endif

    endif

  endif

endif



ifeq ($(KOKKOS_INTERNAL_USE_ARCH_AVX), 1)

  tmp := $(shell echo "\#define KOKKOS_ARCH_AVX 1" >> KokkosCore_config.tmp )
@@ -689,7 +742,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1) 
  endif

endif



KOKKOS_INTERNAL_LS_CONFIG := $(shell ls KokkosCore_config.h)

KOKKOS_INTERNAL_LS_CONFIG := $(shell ls KokkosCore_config.h 2>&1)

ifeq ($(KOKKOS_INTERNAL_LS_CONFIG), KokkosCore_config.h)

  KOKKOS_INTERNAL_NEW_CONFIG := $(strip $(shell diff KokkosCore_config.h KokkosCore_config.tmp | grep define | wc -l))

else

lib/kokkos/Makefile.targets

+6 −2
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ Kokkos_TaskQueue.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Ta 
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_TaskQueue.cpp

Kokkos_HostThreadTeam.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_HostThreadTeam.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_HostThreadTeam.cpp

Kokkos_spinwait.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_spinwait.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_spinwait.cpp

Kokkos_Spinwait.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Spinwait.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Spinwait.cpp

Kokkos_Rendezvous.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Rendezvous.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Rendezvous.cpp

Kokkos_Profiling_Interface.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Profiling_Interface.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Profiling_Interface.cpp

Kokkos_SharedAlloc.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_SharedAlloc.cpp
@@ -36,6 +38,8 @@ Kokkos_CudaSpace.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cu 
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_CudaSpace.cpp

Kokkos_Cuda_Task.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Task.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Task.cpp

Kokkos_Cuda_Locks.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Locks.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Locks.cpp

endif



ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)

lib/kokkos/algorithms/unit_tests/TestOpenMP.cpp

+9 −4
Original line number Diff line number Diff line
@@ -61,14 +61,19 @@ protected: 
  {

    std::cout << std::setprecision(5) << std::scientific;



    unsigned threads_count = omp_get_max_threads();

    int threads_count = 0;

    #pragma omp parallel

    {

      #pragma omp atomic

      ++threads_count;

    }



    if ( Kokkos::hwloc::available() ) {

      threads_count = Kokkos::hwloc::get_available_numa_count() *

                      Kokkos::hwloc::get_available_cores_per_numa();

    if (threads_count > 3) {

      threads_count /= 2;

    }



    Kokkos::OpenMP::initialize( threads_count );

    Kokkos::OpenMP::print_configuration( std::cout );

  }



  static void TearDownTestCase()

lib/kokkos/algorithms/unit_tests/TestRandom.hpp

+19 −19
Original line number Diff line number Diff line
@@ -283,12 +283,12 @@ struct test_random_scalar { 
                      RandomGenerator& pool,

                      unsigned int num_draws)

  {

    using std::cerr;

    using std::cout;

    using std::endl;

    using Kokkos::parallel_reduce;



    {

      cerr << " -- Testing randomness properties" << endl;

      cout << " -- Testing randomness properties" << endl;



      RandomProperties result;

      typedef test_random_functor<RandomGenerator, Scalar> functor_type;
@@ -307,7 +307,7 @@ struct test_random_scalar { 
                    ( 1.5*tolerance > variance_eps)) ? 1:0;

      pass_covar = ((-2.0*tolerance < covariance_eps) &&

                    ( 2.0*tolerance > covariance_eps)) ? 1:0;

      cerr << "Pass: " << pass_mean

      cout << "Pass: " << pass_mean

           << " " << pass_var

           << " " << mean_eps

           << " " << variance_eps
@@ -315,7 +315,7 @@ struct test_random_scalar { 
           << " || " << tolerance << endl;

    }

    {

      cerr << " -- Testing 1-D histogram" << endl;

      cout << " -- Testing 1-D histogram" << endl;



      RandomProperties result;

      typedef test_histogram1d_functor<typename RandomGenerator::device_type> functor_type;
@@ -335,7 +335,7 @@ struct test_random_scalar { 
      pass_hist1d_covar = ((-0.06 < covariance_eps) &&

                           ( 0.06 > covariance_eps)) ? 1:0;



      cerr << "Density 1D: " << mean_eps

      cout << "Density 1D: " << mean_eps

           << " " << variance_eps

           << " " << (result.covariance/HIST_DIM1D/HIST_DIM1D)

           << " || " << tolerance
@@ -348,7 +348,7 @@ struct test_random_scalar { 
           << endl;

    }

    {

      cerr << " -- Testing 3-D histogram" << endl;

      cout << " -- Testing 3-D histogram" << endl;



      RandomProperties result;

      typedef test_histogram3d_functor<typename RandomGenerator::device_type> functor_type;
@@ -368,7 +368,7 @@ struct test_random_scalar { 
      pass_hist3d_covar = ((-tolerance < covariance_eps) &&

                           ( tolerance > covariance_eps)) ? 1:0;



      cerr << "Density 3D: " << mean_eps

      cout << "Density 3D: " << mean_eps

           << " " << variance_eps

           << " " << result.covariance/HIST_DIM1D/HIST_DIM1D

           << " || " << tolerance
@@ -381,18 +381,18 @@ struct test_random_scalar { 
template <class RandomGenerator>

void test_random(unsigned int num_draws)

{

  using std::cerr;

  using std::cout;

  using std::endl;

  typename test_random_functor<RandomGenerator,int>::type_1d density_1d("D1d");

  typename test_random_functor<RandomGenerator,int>::type_3d density_3d("D3d");





  uint64_t ticks = std::chrono::high_resolution_clock::now().time_since_epoch().count();

  cerr << "Test Seed:" << ticks << endl;

  cout << "Test Seed:" << ticks << endl;



  RandomGenerator pool(ticks);



  cerr << "Test Scalar=int" << endl;

  cout << "Test Scalar=int" << endl;

  test_random_scalar<RandomGenerator,int> test_int(density_1d,density_3d,pool,num_draws);

  ASSERT_EQ( test_int.pass_mean,1);

  ASSERT_EQ( test_int.pass_var,1);
@@ -406,7 +406,7 @@ void test_random(unsigned int num_draws) 
  deep_copy(density_1d,0);

  deep_copy(density_3d,0);



  cerr << "Test Scalar=unsigned int" << endl;

  cout << "Test Scalar=unsigned int" << endl;

  test_random_scalar<RandomGenerator,unsigned int> test_uint(density_1d,density_3d,pool,num_draws);

  ASSERT_EQ( test_uint.pass_mean,1);

  ASSERT_EQ( test_uint.pass_var,1);
@@ -420,7 +420,7 @@ void test_random(unsigned int num_draws) 
  deep_copy(density_1d,0);

  deep_copy(density_3d,0);



  cerr << "Test Scalar=int64_t" << endl;

  cout << "Test Scalar=int64_t" << endl;

  test_random_scalar<RandomGenerator,int64_t> test_int64(density_1d,density_3d,pool,num_draws);

  ASSERT_EQ( test_int64.pass_mean,1);

  ASSERT_EQ( test_int64.pass_var,1);
@@ -434,7 +434,7 @@ void test_random(unsigned int num_draws) 
  deep_copy(density_1d,0);

  deep_copy(density_3d,0);



  cerr << "Test Scalar=uint64_t" << endl;

  cout << "Test Scalar=uint64_t" << endl;

  test_random_scalar<RandomGenerator,uint64_t> test_uint64(density_1d,density_3d,pool,num_draws);

  ASSERT_EQ( test_uint64.pass_mean,1);

  ASSERT_EQ( test_uint64.pass_var,1);
@@ -448,7 +448,7 @@ void test_random(unsigned int num_draws) 
  deep_copy(density_1d,0);

  deep_copy(density_3d,0);



  cerr << "Test Scalar=float" << endl;

  cout << "Test Scalar=float" << endl;

  test_random_scalar<RandomGenerator,float> test_float(density_1d,density_3d,pool,num_draws);

  ASSERT_EQ( test_float.pass_mean,1);

  ASSERT_EQ( test_float.pass_var,1);
@@ -462,7 +462,7 @@ void test_random(unsigned int num_draws) 
  deep_copy(density_1d,0);

  deep_copy(density_3d,0);



  cerr << "Test Scalar=double" << endl;

  cout << "Test Scalar=double" << endl;

  test_random_scalar<RandomGenerator,double> test_double(density_1d,density_3d,pool,num_draws);

  ASSERT_EQ( test_double.pass_mean,1);

  ASSERT_EQ( test_double.pass_var,1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE