Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Final charm backend #644

Open
wants to merge 19 commits into
base: devel
Choose a base branch
from
Open

Final charm backend #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ecb13af
Create a build skeleton for the Charm++ backend
epmikida Mar 2, 2020
0c42d77
Change CMake to allow for .ci compilation
epmikida Mar 10, 2020
029f141
Create charm backend from copy of legion backend
epmikida Jun 15, 2020
b97b0f8
Fix CMAKE for charm backend
epmikida Jun 15, 2020
a92b1ca
Update context to use charm runtime instead of legion
epmikida Jun 15, 2020
aa8ab2c
Remove rest of legion code from context
epmikida Jun 16, 2020
793fb32
Get tasks executing inline with non-flecsi data
epmikida Jul 8, 2020
0403fb8
Quick changes to get global tests passing with basic field reg
epmikida Aug 3, 2020
e93e4fc
Clean out some old legion code from exec
epmikida Aug 4, 2020
fd84b48
More aggressively remove legion from charm build
epmikida Aug 5, 2020
1f342c0
Add dummy future and make test tasks function properly
epmikida Aug 6, 2020
9213839
Fix test build dependency
epmikida Aug 7, 2020
50b1deb
Add more to field registration code
epmikida Aug 10, 2020
240a8b4
Remove decl and def files from repo
epmikida Aug 11, 2020
afafe80
Bring up to date with devel API changes
epmikida Aug 14, 2020
ffe7f70
Minor cleanup and commenting
epmikida Aug 14, 2020
fe9ab4b
Small fixes to wrap up recent rebase
epmikida Aug 18, 2020
8a6e8ba
Remove extra call to MPI_Finalize
epmikida Sep 1, 2020
ec884b1
Cleanup for merge
epmikida Sep 9, 2020
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
36 changes: 32 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ if(NOT FORMAT_ONLY)
#----------------------------------------------------------------------------#
# Add options for runtime selection
#----------------------------------------------------------------------------#

set(FLECSI_RUNTIME_MODELS legion mpi hpx)
set(FLECSI_RUNTIME_MODELS legion mpi hpx charm)

if(NOT FLECSI_RUNTIME_MODEL)
list(GET FLECSI_RUNTIME_MODELS 0 FLECSI_RUNTIME_MODEL)
Expand All @@ -129,9 +128,13 @@ if(NOT FORMAT_ONLY)
elseif(FLECSI_RUNTIME_MODEL STREQUAL "hpx")
set(ENABLE_MPI ON CACHE BOOL "Enable MPI" FORCE)
set(ENABLE_HPX ON CACHE BOOL "Enable HPX" FORCE)
elseif(FLECSI_RUNTIME_MODEL STREQUAL "charm")
set(ENABLE_MPI ON CACHE BOOL "Enable MPI" FORCE)
set(ENABLE_CHARM ON CACHE BOOL "Enable Charm" FORCE)
set(ENABLE_LEGION OFF CACHE BOOL "Enable Legion" FORCE)
endif()

mark_as_advanced(ENABLE_MPI ENABLE_LEGION ENABLE_HPX)
mark_as_advanced(ENABLE_MPI ENABLE_LEGION ENABLE_HPX ENABLE_CHARM)

#----------------------------------------------------------------------------#
# Legion
Expand All @@ -157,6 +160,14 @@ if(NOT FORMAT_ONLY)
include(hpx)
endif()

#----------------------------------------------------------------------------#
# Charm
#----------------------------------------------------------------------------#

if(ENABLE_CHARM)
include(charm)
endif()

#----------------------------------------------------------------------------#
# OpenMP.
#----------------------------------------------------------------------------#
Expand Down Expand Up @@ -259,6 +270,10 @@ if(NOT FORMAT_ONLY)

set(FLECSI_RUNTIME_LIBRARIES ${DL_LIBS} ${MPI_LIBRARIES})

#----------------------------------------------------------------------------#
# HPX interface
#----------------------------------------------------------------------------#

elseif(FLECSI_RUNTIME_MODEL STREQUAL "hpx")

if(NOT HPX_FOUND)
Expand All @@ -269,10 +284,23 @@ if(NOT FORMAT_ONLY)
message (FATAL_ERROR "MPI is required for the hpx runtime model")
endif()

set(FLECSI_RUNTIME_LIBRARIES ${DL_LIBS} ${MPI_LIBRARIES})
set(FLECSI_RUNTIME_LIBRARIES ${DL_LIBS} ${MPI_LIBRARIES})

set(_runtime_path ${PROJECT_SOURCE_DIR}/flecsi/execution/hpx)

#----------------------------------------------------------------------------#
# Charm interface
#----------------------------------------------------------------------------#
elseif(FLECSI_RUNTIME_MODEL STREQUAL "charm")

if(NOT MPI_${MPI_LANGUAGE}_FOUND)
message (FATAL_ERROR "MPI is required for the charm runtime model")
endif()

set(_runtime_path ${PROJECT_SOURCE_DIR}/flecsi/execution/charm)

set(FLECSI_RUNTIME_LIBRARIES ${DL_LIBS} ${MPI_LIBRARIES})

#----------------------------------------------------------------------------#
# Default
#----------------------------------------------------------------------------#
Expand Down
37 changes: 37 additions & 0 deletions cmake/charm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#------------------------------------------------------------------------------#
# @@@@@@@@ @@ @@@@@@ @@@@@@@@ @@
# /@@///// /@@ @@////@@ @@////// /@@
# /@@ /@@ @@@@@ @@ // /@@ /@@
# /@@@@@@@ /@@ @@///@@/@@ /@@@@@@@@@/@@
# /@@//// /@@/@@@@@@@/@@ ////////@@/@@
# /@@ /@@/@@//// //@@ @@ /@@/@@
# /@@ @@@//@@@@@@ //@@@@@@ @@@@@@@@ /@@
# // /// ////// ////// //////// //
#
# Copyright (c) 2016 Los Alamos National Laboratory, LLC
# All rights reserved
#------------------------------------------------------------------------------#

option(ENABLE_CHARM "Enable Charm" OFF)

if(ENABLE_CHARM)

add_definitions(-DREALM_USE_CMAKE)

file(GLOB_RECURSE ci-files ${CMAKE_SOURCE_DIR}/flecsi/*.ci)

foreach(in_file ${ci-files})
get_filename_component(ci-output ${in_file} NAME_WE)
get_filename_component(ci-dir ${in_file} DIRECTORY)
string(APPEND ci-output ".decl.h")
set(all-ci-outputs ${all-cioutputs} ${ci-dir}/${ci-output})
add_custom_command(
OUTPUT ${ci-dir}/${ci-output}
COMMAND ${CMAKE_CXX_COMPILER} ${in_file}
WORKING_DIRECTORY ${ci-dir}
DEPENDS ${in_file}
)
endforeach()
message (STATUS "Created command for " ${all-ci-outputs})

endif(ENABLE_CHARM)
20 changes: 19 additions & 1 deletion cmake/unit.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@ mark_as_advanced(ENABLE_EXPENSIVE_TESTS)

if(ENABLE_UNIT_TESTS)
enable_testing()
add_library(unit-main OBJECT ${CMAKE_SOURCE_DIR}/flecsi/util/unit/main.cc)

if(FLECSI_RUNTIME_MODEL STREQUAL "charm")
# Ensure that decl and def headers are generated before tests are compiled
add_library(unit-main OBJECT
${CMAKE_SOURCE_DIR}/flecsi/util/unit/main.cc ${all-ci-outputs})
else()
add_library(unit-main OBJECT ${CMAKE_SOURCE_DIR}/flecsi/util/unit/main.cc)
endif()
endif()

function(add_unit name)
Expand Down Expand Up @@ -123,6 +130,17 @@ function(add_unit name)
set(unit_policy_exec_preflags ${MPIEXEC_PREFLAGS})
set(unit_policy_exec_postflags ${MPIEXEC_POSTFLAGS})

elseif(FLECSI_RUNTIME_MODEL STREQUAL "charm"
AND MPI_${MPI_LANGUAGE}_FOUND)

set(unit_policy_flags ${MPI_${MPI_LANGUAGE}_COMPILE_FLAGS})
set(unit_policy_includes ${MPI_${MPI_LANGUAGE}_INCLUDE_PATH})
set(unit_policy_libraries ${MPI_${MPI_LANGUAGE}_LIBRARIES})
set(unit_policy_exec ${MPIEXEC})
set(unit_policy_exec_threads ${MPIEXEC_NUMPROC_FLAG})
set(unit_policy_exec_preflags ${MPIEXEC_PREFLAGS})
set(unit_policy_exec_postflags ${MPIEXEC_POSTFLAGS})

else()

message(WARNING "invalid runtime")
Expand Down
2 changes: 2 additions & 0 deletions config/flecsi-config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#define FLECSI_RUNTIME_MODEL_legion 1
#define FLECSI_RUNTIME_MODEL_mpi 2
#define FLECSI_RUNTIME_MODEL_hpx 3
#define FLECSI_RUNTIME_MODEL_charm 4
#cmakedefine FLECSI_RUNTIME_MODEL FLECSI_RUNTIME_MODEL_@FLECSI_RUNTIME_MODEL@

//----------------------------------------------------------------------------//
Expand All @@ -19,6 +20,7 @@

#cmakedefine FLECSI_ENABLE_MPI
#cmakedefine FLECSI_ENABLE_LEGION
#cmakedefine FLECSI_ENABLE_CHARM

//----------------------------------------------------------------------------//
// Enable Legion thread-local storage interface
Expand Down
11 changes: 11 additions & 0 deletions flecsi/data/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ elseif(FLECSI_RUNTIME_MODEL STREQUAL "hpx")
${data_SOURCES}
)

elseif(FLECSI_RUNTIME_MODEL STREQUAL "charm")

set(data_HEADERS
charm/policy.hh
${data_HEADERS}
)

set(data_SOURCES
${data_SOURCES}
)

endif()

#------------------------------------------------------------------------------#
Expand Down
4 changes: 4 additions & 0 deletions flecsi/data/backend.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,8 @@ constexpr inline std::size_t logical_size = 1ul << 32;

#include <flecsi/data/hpx/policy.hh>

#elif FLECSI_RUNTIME_MODEL == FLECSI_RUNTIME_MODEL_charm

#include "flecsi/data/charm/policy.hh"

#endif // FLECSI_RUNTIME_MODEL
81 changes: 81 additions & 0 deletions flecsi/data/charm/policy.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*
@@@@@@@@ @@ @@@@@@ @@@@@@@@ @@
/@@///// /@@ @@////@@ @@////// /@@
/@@ /@@ @@@@@ @@ // /@@ /@@
/@@@@@@@ /@@ @@///@@/@@ /@@@@@@@@@/@@
/@@//// /@@/@@@@@@@/@@ ////////@@/@@
/@@ /@@/@@//// //@@ @@ /@@/@@
/@@ @@@//@@@@@@ //@@@@@@ @@@@@@@@ /@@
// /// ////// ////// //////// //

Copyright (c) 2016, Triad National Security, LLC
All rights reserved.
*/
#pragma once

/*! @file */

#if !defined(__FLECSI_PRIVATE__)
#error Do not include this file directly!
#endif

#if !defined(FLECSI_ENABLE_CHARM)
#error FLECSI_ENABLE_CHARM not defined! This file depends on Charm!
#endif

#include "flecsi/run/backend.hh"
#include "flecsi/topo/core.hh" // single_space

namespace flecsi {
namespace data {
namespace charm {

// TODO: These are just placeholder definitions for region and partition
// while the topo interface for Flecsi is still in flux.
struct region {
region(size2 s, const fields & fs) : s_(s) {}
size2 size() const { return s_; }
template<topo::single_space>
region & get_region() {
return *this;
}
template<class D>
void cleanup(field_id_t f, D d) {}

size2 s_;
};

struct partition {
using row = std::size_t;
static row make_row(std::size_t i, std::size_t n) {
return i;
}
static std::size_t row_size(const row& r) {
return 0;
}
partition(const region & reg) {}
partition(const region & reg,
const partition & src,
field_id_t fid,
completeness cpt = incomplete) {}

std::size_t colors() const {
// TODO: This may not be correct
return CkNumPes();
}

template<topo::single_space>
const partition & get_partition() const {
return *this;
}

void
update(const partition& src, field_id_t fid, completeness cpt = incomplete) {
}
};
} // namespace charm

using charm::region, charm::partition; // for backend-agnostic interface

} // namespace data
} // namespace flecsi
11 changes: 11 additions & 0 deletions flecsi/exec/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,17 @@ elseif(FLECSI_RUNTIME_MODEL STREQUAL "mpi")

elseif(FLECSI_RUNTIME_MODEL STREQUAL "hpx")

elseif(FLECSI_RUNTIME_MODEL STREQUAL "charm")

set(exec_HEADERS
${exec_HEADERS}
charm/bind_accessors.hh
charm/task_wrapper.hh
charm/policy.hh
charm/future.hh
charm/task_prologue.hh
)

endif()

#------------------------------------------------------------------------------#
Expand Down
4 changes: 4 additions & 0 deletions flecsi/exec/backend.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,8 @@ auto execute(ARGS &&...);

#include "flecsi/exec/hpx/policy.hh"

#elif FLECSI_RUNTIME_MODEL == FLECSI_RUNTIME_MODEL_charm

#include "flecsi/exec/charm/policy.hh"

#endif // FLECSI_RUNTIME_MODEL
Loading