diff --git a/HW10/CMakeLists.txt b/HW10/CMakeLists.txt index 86940ef..fdcf455 100644 --- a/HW10/CMakeLists.txt +++ b/HW10/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.15) project(HW10) -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 11) +SET(CMAKE_CXX_COMPILER mpicxx) find_package(MPI REQUIRED) add_definitions(-DOMPI_SKIP_MPICXX) - set(HEADER_FILES MakePermutationMatrix.h ReadFromFile.h @@ -17,7 +17,7 @@ set(SOURCE_FILES set(CMAKE_CXX_STANDARD 17) add_executable(HW10 ${HEADER_FILES} ${SOURCE_FILES} main.cpp) -set_property(TARGET HW10 PROPERTY CXX_STANDARD 17) +set_property(TARGET HW10 PROPERTY CXX_STANDARD 11) target_compile_options(HW10 PRIVATE -Wall -Wextra -pedantic -Wl,--stack,10000000 -O3) target_link_libraries(HW10 PRIVATE MPI::MPI_C) diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache index 61afb55..de6f05b 100644 --- a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache +++ b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache @@ -8,10 +8,6 @@ /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h -/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.cpp -CostMatrixGenerator.h -/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.h - /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.h City.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h @@ -20,22 +16,6 @@ cmath vector - -/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp -MakePermutationMatrix.h -/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h - -/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h -City.h -/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h -vector -- - -/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.cpp -filesystem -- -ReadFromFile.h -/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h - /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h City.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/build.make b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/build.make index af6e356..d5f8ea4 100644 --- a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/build.make +++ b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/build.make @@ -60,54 +60,54 @@ include CMakeFiles/HW10.dir/flags.make CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o: CMakeFiles/HW10.dir/flags.make CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o: ../MakePermutationMatrix.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o -c /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o -c /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.i" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp > CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.i + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp > CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.i CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.s" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp -o CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.s + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp -o CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.s CMakeFiles/HW10.dir/ReadFromFile.cpp.o: CMakeFiles/HW10.dir/flags.make CMakeFiles/HW10.dir/ReadFromFile.cpp.o: ../ReadFromFile.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object CMakeFiles/HW10.dir/ReadFromFile.cpp.o" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/HW10.dir/ReadFromFile.cpp.o -c /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.cpp + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/HW10.dir/ReadFromFile.cpp.o -c /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.cpp CMakeFiles/HW10.dir/ReadFromFile.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/HW10.dir/ReadFromFile.cpp.i" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.cpp > CMakeFiles/HW10.dir/ReadFromFile.cpp.i + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.cpp > CMakeFiles/HW10.dir/ReadFromFile.cpp.i CMakeFiles/HW10.dir/ReadFromFile.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/HW10.dir/ReadFromFile.cpp.s" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.cpp -o CMakeFiles/HW10.dir/ReadFromFile.cpp.s + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.cpp -o CMakeFiles/HW10.dir/ReadFromFile.cpp.s CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o: CMakeFiles/HW10.dir/flags.make CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o: ../CostMatrixGenerator.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building CXX object CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o -c /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.cpp + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o -c /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.cpp CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.i" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.cpp > CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.i + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.cpp > CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.i CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.s" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.cpp -o CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.s + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.cpp -o CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.s CMakeFiles/HW10.dir/main.cpp.o: CMakeFiles/HW10.dir/flags.make CMakeFiles/HW10.dir/main.cpp.o: ../main.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/HW10.dir/main.cpp.o" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/HW10.dir/main.cpp.o -c /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/HW10.dir/main.cpp.o -c /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp CMakeFiles/HW10.dir/main.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/HW10.dir/main.cpp.i" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp > CMakeFiles/HW10.dir/main.cpp.i + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp > CMakeFiles/HW10.dir/main.cpp.i CMakeFiles/HW10.dir/main.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/HW10.dir/main.cpp.s" - /Library/Developer/CommandLineTools/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp -o CMakeFiles/HW10.dir/main.cpp.s + mpicxx $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp -o CMakeFiles/HW10.dir/main.cpp.s # Object files for target HW10 HW10_OBJECTS = \ diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/flags.make b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/flags.make index 8993194..7560fff 100644 --- a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/flags.make +++ b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/flags.make @@ -1,8 +1,8 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.15 -# compile CXX with /Library/Developer/CommandLineTools/usr/bin/c++ -CXX_FLAGS = -g -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -Wall -Wextra -pedantic -Wl,--stack,10000000 -O3 -std=gnu++1z +# compile CXX with mpicxx +CXX_FLAGS = -g -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -Wall -Wextra -pedantic -Wl,--stack,10000000 -O3 -std=gnu++11 CXX_DEFINES = -DOMPI_SKIP_MPICXX diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/link.txt b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/link.txt index 9a4d847..981b580 100644 --- a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/link.txt +++ b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/link.txt @@ -1 +1 @@ -/Library/Developer/CommandLineTools/usr/bin/c++ -g -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -Wl,-search_paths_first -Wl,-headerpad_max_install_names -L/usr/local/Cellar/libevent/2.1.11_1/lib CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o CMakeFiles/HW10.dir/ReadFromFile.cpp.o CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o CMakeFiles/HW10.dir/main.cpp.o -o HW10 /usr/local/Cellar/open-mpi/4.0.2/lib/libmpi.dylib +mpicxx -g -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -Wl,-search_paths_first -Wl,-headerpad_max_install_names -L/usr/local/Cellar/libevent/2.1.11_1/lib CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o CMakeFiles/HW10.dir/ReadFromFile.cpp.o CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o CMakeFiles/HW10.dir/main.cpp.o -o HW10 /usr/local/Cellar/open-mpi/4.0.2/lib/libmpi.dylib diff --git a/HW10/cmake-build-debug/HW10 b/HW10/cmake-build-debug/HW10 index 39c1e0a..d339ac6 100755 Binary files a/HW10/cmake-build-debug/HW10 and b/HW10/cmake-build-debug/HW10 differ