Commit 5d27d2fc authored by Pillai, Himanshu's avatar Pillai, Himanshu
Browse files

Evaluation Parameters

parent 5bd99530
Evaluation
================
| Tables | FORTRAN | C++ |
| -------------- |:-------------:| ------------: |
| FORTRAN | Works | Works |
| C++ | | Works |
| LEGION Fortran | N/A | 1 |
| LEGION C++ |Partially | Works |
| KOKKOS Fortran | X | X |
| KOKKOS C++ | X | Debugging mode|
| CUDA | X | Debugging mode|
| OpenMP/OpenACC | Works | On it |
| FleCSI | N/A | On it |
| Tpetra | N/A | N/A |
......@@ -18,7 +18,7 @@
namespace ELM {
void CanopyHydrology_Interception(double dtime,
KOKKOS_INLINE_FUNCTION void CanopyHydrology_Interception(double dtime,
const double& forc_rain,
const double& forc_snow,
const double& irrig_rate,
......@@ -195,14 +195,14 @@ int main(int argc, char ** argv)
const double dewmx = 0.1;
double dtime = 1800.0;
Kokkos::HostSpace::execution_space::initialize();
Kokkos::Cuda::initialize( );//argc, argv );
Kokkos::initialize( );//argc, argv );
{
typedef Kokkos::View<double**> ViewMatrixType;
typedef Kokkos::Cuda ExecSpace;
typedef Kokkos::Cuda MemSpace;
typedef Kokkos::RangePolicy<ExecSpace> range_policy;
// typedef Kokkos::Cuda ExecSpace;
// typedef Kokkos::Cuda MemSpace;
// typedef Kokkos::RangePolicy<ExecSpace> range_policy;
ViewMatrixType elai( "elai", n_months, n_pfts );
ViewMatrixType esai( "esai", n_months, n_pfts );
......@@ -344,7 +344,6 @@ int main(int argc, char ** argv)
}
}
//Kokkos::finalize();
Kokkos::Cuda::finalize();
Kokkos::HostSpace::execution_space::finalize();
Kokkos::finalize();
return 0;
}
/* ---------------------------------------------
Makefile constructed configuration:
Thu Apr 18 14:15:29 EDT 2019
Tue May 14 16:33:29 EDT 2019
----------------------------------------------*/
#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
......@@ -21,7 +21,6 @@ Thu Apr 18 14:15:29 EDT 2019
/* Optimization Settings */
/* Cuda Settings */
#define KOKKOS_ENABLE_CUDA_UVM
#define KOKKOS_ENABLE_CUDA_LAMBDA
#define KOKKOS_ARCH_AVX2
#define KOKKOS_ARCH_PASCAL
#define KOKKOS_ARCH_PASCAL60
/* ---------------------------------------------
Makefile constructed configuration:
Thu Apr 18 14:24:18 EDT 2019
Tue May 14 16:33:29 EDT 2019
----------------------------------------------*/
#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
......@@ -21,7 +21,6 @@ Thu Apr 18 14:24:18 EDT 2019
/* Optimization Settings */
/* Cuda Settings */
#define KOKKOS_ENABLE_CUDA_UVM
#define KOKKOS_ENABLE_CUDA_LAMBDA
#define KOKKOS_ARCH_AVX2
#define KOKKOS_ARCH_PASCAL
#define KOKKOS_ARCH_PASCAL60
......@@ -14,7 +14,7 @@ ifneq (,$(findstring Cuda,$(KOKKOS_DEVICES)))
CXX = ${KOKKOS_PATH}/bin/nvcc_wrapper
EXE = ${EXE_NAME}.cuda
KOKKOS_ARCH = "HSW,Pascal60"
KOKKOS_CUDA_OPTIONS = "enable_lambda,force_uvm"
KOKKOS_CUDA_OPTIONS = "force_uvm" #enable_lambda,
else
CXX = g++
EXE = ${EXE_NAME}.host
......
......@@ -63,7 +63,7 @@ void read_phenology(const std::string& fname,
// LAI. Good for C order, bad for Fortran
for (int i=offset; i!=offset+n_grid_cells; ++i) {
for (int j=0; j!=n_pfts; ++j) {
lai(i,j) = data[(i-offset)*n_pfts + j];
lai(j,i) = data[(i-offset)*n_pfts + j];
}
}
......@@ -78,7 +78,7 @@ void read_phenology(const std::string& fname,
// LAI. Good for C order, bad for Fortran
for (int i=offset; i!=offset+n_grid_cells; ++i) {
for (int j=0; j!=n_pfts; ++j) {
sai(i,j) = data[(i-offset)*n_pfts + j];
sai(j,i) = data[(i-offset)*n_pfts + j];
}
}
......
Time Total Canopy Water Min Water Max Water
0 0 0 0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment