From 5ad488241ec704ec06c10d911049274a4d920e1c Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Fri, 16 Nov 2018 16:55:09 +0100 Subject: [PATCH] [smpi args cleanup] remove load-balancer-replay The example was partly deactivated. This commit removes the files from the repo (for now). --- .gitignore | 1 - .../smpi/load_balancer_replay/CMakeLists.txt | 13 ----------- .../load_balancer_replay.cpp | 23 ------------------- tools/cmake/DefinePackages.cmake | 1 - 4 files changed, 38 deletions(-) delete mode 100644 examples/smpi/load_balancer_replay/CMakeLists.txt delete mode 100644 examples/smpi/load_balancer_replay/load_balancer_replay.cpp diff --git a/.gitignore b/.gitignore index fd10bb3070..a3295e5f05 100644 --- a/.gitignore +++ b/.gitignore @@ -210,7 +210,6 @@ examples/smpi/ampi/smpi_ampi examples/smpi/energy/f77/sef examples/smpi/energy/f90/sef90 examples/smpi/energy/smpi_energy -examples/smpi/load_balancer_replay/load_balancer_replay examples/smpi/mc/smpi_bugged1 examples/smpi/mc/smpi_bugged1_liveness examples/smpi/mc/smpi_bugged2 diff --git a/examples/smpi/load_balancer_replay/CMakeLists.txt b/examples/smpi/load_balancer_replay/CMakeLists.txt deleted file mode 100644 index 73aae8733e..0000000000 --- a/examples/smpi/load_balancer_replay/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -if(enable_smpi) - set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") - set(CMAKE_CXX_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicxx") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - - add_executable (load_balancer_replay load_balancer_replay.cpp) - target_link_libraries(load_balancer_replay simgrid) - # ADD_TESH(sampi-load-balancer-replay --setenv srcdir=${CMAKE_CURRENT_SOURCE_DIR} --setenv bindir=${CMAKE_CURRENT_BINARY_DIR} --cd ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/load_balancer_replay.tesh) -endif() - -# Uncomment this to install tesh files -#set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/load_balancer_replay.tesh PARENT_SCOPE) -set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/load_balancer_replay.cpp PARENT_SCOPE) diff --git a/examples/smpi/load_balancer_replay/load_balancer_replay.cpp b/examples/smpi/load_balancer_replay/load_balancer_replay.cpp deleted file mode 100644 index 7c0bfb4a62..0000000000 --- a/examples/smpi/load_balancer_replay/load_balancer_replay.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#include "smpi/smpi.h" -#include "smpi/sampi.h" -#include -#include -#include - -XBT_LOG_NEW_DEFAULT_CATEGORY(sampi_load_balancer_test, "Messages specific for this sampi example"); - - -int main(int argc, char* argv[]) -{ - sg_host_load_plugin_init(); - smpi_replay_init(&argc, &argv); - sg_load_balancer_plugin_init(); // Must be called after smpi_replay_init as this will overwrite some replay actions - - smpi_replay_main(&argc, &argv); - return 0; -} diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 71f0815b68..ecc3468fc7 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1013,7 +1013,6 @@ set(CMAKEFILES_TXT examples/smpi/smpi_msg_masterslave/CMakeLists.txt examples/smpi/replay_multiple/CMakeLists.txt examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt - examples/smpi/load_balancer_replay/CMakeLists.txt examples/smpi/energy/f77/CMakeLists.txt examples/smpi/energy/f90/CMakeLists.txt -- 2.20.1