Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions include/ygm/io/ndjson_parser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ namespace ygm::io {
* @param keys Keys to erase
* @return Number of keys erased
*/
std::size_t json_erase(boost::json::object &obj,
const std::vector<std::string> &keys) {
inline std::size_t json_erase(boost::json::object &obj,
const std::vector<std::string> &keys) {
std::size_t num_erased = 0;
for (const auto &key : keys) {
num_erased += obj.erase(key);
Expand All @@ -39,8 +39,8 @@ std::size_t json_erase(boost::json::object &obj,
* @param include_keys Keys to leave in JSON object
* @return Number of keys filtered from JSON object
*/
std::size_t json_filter(boost::json::object &obj,
const std::vector<std::string> &include_keys) {
inline std::size_t json_filter(boost::json::object &obj,
const std::vector<std::string> &include_keys) {
std::set<std::string> include_keys_set{include_keys.begin(),
include_keys.end()};
std::vector<std::string> keys_to_erase;
Expand Down
2 changes: 1 addition & 1 deletion include/ygm/io/parquet_parser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct parquet_data_type {
friend std::ostream &operator<<(std::ostream &, const parquet_data_type &);
};

std::ostream &operator<<(std::ostream &os, const parquet_data_type &t) {
inline std::ostream &operator<<(std::ostream &os, const parquet_data_type &t) {
os << parquet::TypeToString(t.type);
if (!t.supported()) {
os << " (unsupported)";
Expand Down
4 changes: 2 additions & 2 deletions include/ygm/utility/boost_json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#error BOOST >= 1.75 is required for Boost.JSON
#endif

#include <boost/json/src.hpp>
#include <boost/json.hpp>
#include <cereal/cereal.hpp>
#include <string>

Expand Down Expand Up @@ -176,4 +176,4 @@ void CEREAL_LOAD_FUNCTION_NAME(Archive &archive, bj::string &str) {
cereal::binary_data(const_cast<char *>(str.data()), size * sizeof(char)));
}

} // namespace cereal
} // namespace cereal
7 changes: 7 additions & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ add_ygm_test(test_work_queue)
if (Arrow_FOUND AND Parquet_FOUND)
add_ygm_test(test_parquet_reader)
link_arrow_parquet(MPI_test_parquet_reader)

add_library(test_multi_compilation_unit_lib test_multi_compilation_unit_lib.cpp)
target_link_libraries(test_multi_compilation_unit_lib PUBLIC ygm::ygm)
link_arrow_parquet(test_multi_compilation_unit_lib)
add_ygm_test(test_multi_compilation_unit_driver)
target_link_libraries(MPI_test_multi_compilation_unit_driver PRIVATE test_multi_compilation_unit_lib)
link_arrow_parquet(MPI_test_multi_compilation_unit_driver)
endif ()

#
Expand Down
8 changes: 8 additions & 0 deletions test/test_multi_compilation_unit_driver.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

#include "test_multi_compilation_unit_lib.h"

int main() {
dummy_function();

return 0;
}
4 changes: 4 additions & 0 deletions test/test_multi_compilation_unit_lib.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

#include "test_multi_compilation_unit_lib.h"

void dummy_function() { return; }
25 changes: 25 additions & 0 deletions test/test_multi_compilation_unit_lib.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

// Including all of YGM (except parquet_parser)
#include <ygm/comm.hpp>
#include <ygm/random.hpp>

#include <ygm/container/array.hpp>
#include <ygm/container/bag.hpp>
#include <ygm/container/counting_set.hpp>
#include <ygm/container/disjoint_set.hpp>
#include <ygm/container/map.hpp>
#include <ygm/container/set.hpp>
#include <ygm/container/tagged_bag.hpp>
#include <ygm/container/work_queue.hpp>

#include <ygm/io/csv_parser.hpp>
#include <ygm/io/daily_output.hpp>
#include <ygm/io/line_parser.hpp>
#include <ygm/io/multi_output.hpp>
#include <ygm/io/ndjson_parser.hpp>
#include <ygm/io/parquet_parser.hpp>

#include <ygm/utility/progress_indicator.hpp>
#include <ygm/utility/timer.hpp>

void dummy_function();