From 943ebdb1473b7e99c1536247f286e132bd9839b7 Mon Sep 17 00:00:00 2001 From: Anna Wellmann <a.wellmann@tu-braunschweig.de> Date: Fri, 28 Apr 2023 10:07:50 +0200 Subject: [PATCH] Remove timer from Communicator --- src/gpu/VirtualFluids_GPU/Communication/Communicator.h | 3 --- src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.cpp | 3 --- src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.h | 3 --- src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp | 6 ------ 4 files changed, 15 deletions(-) diff --git a/src/gpu/VirtualFluids_GPU/Communication/Communicator.h b/src/gpu/VirtualFluids_GPU/Communication/Communicator.h index 173d9a4b4..91669f48a 100644 --- a/src/gpu/VirtualFluids_GPU/Communication/Communicator.h +++ b/src/gpu/VirtualFluids_GPU/Communication/Communicator.h @@ -26,9 +26,6 @@ public: virtual void waitGPU(int id) = 0; virtual void resetRequest() = 0; ////////////////////////////////////////////////////////////////////////// - virtual void startTimer() = 0; - virtual void stopTimer() = 0; - virtual double getTime() = 0; virtual int mapCudaDevice(const int &rank, const int &size, const std::vector<unsigned int> &devices, const int &maxdev) = 0; virtual std::vector<double> gatherNUPS(double processNups) = 0; virtual double sumNups(double processNups) = 0; diff --git a/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.cpp b/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.cpp index 1179457cc..c56dae1dd 100644 --- a/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.cpp +++ b/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.cpp @@ -174,9 +174,6 @@ int MpiCommunicator::getNumberOfProcess() const { return numprocs; } int MpiCommunicator::getNeighbourTop() { return nbrtop; } int MpiCommunicator::getNeighbourBottom() { return nbrbottom; } MPI_Comm MpiCommunicator::getMpiCommunicator() { return comm1d; } -void MpiCommunicator::startTimer() { starttime = MPI_Wtime(); } -void MpiCommunicator::stopTimer() { endtime = MPI_Wtime(); } -double MpiCommunicator::getTime() { return endtime - starttime; } void MpiCommunicator::distributeGeometry(unsigned int *dataRoot, unsigned int *dataNode, int dataSizePerNode) { MPI_Scatter(dataRoot, dataSizePerNode, MPI_UNSIGNED, dataNode, dataSizePerNode, MPI_UNSIGNED, 0, MPI_COMM_WORLD); diff --git a/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.h b/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.h index f5fbd35ad..3fc5d1a94 100644 --- a/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.h +++ b/src/gpu/VirtualFluids_GPU/Communication/MpiCommunicator.h @@ -54,9 +54,6 @@ public: ////////////////////////////////////////////////////////////////////////// void exchngDataGeo(int *sbuf_t, int *rbuf_t, int *sbuf_b, int *rbuf_b, int count); MPI_Comm getMpiCommunicator(); - void startTimer() override; - void stopTimer() override; - double getTime() override; int mapCudaDevice(const int &rank, const int &size, const std::vector<unsigned int> &devices, const int &maxdev) override; std::vector<double> gatherNUPS(double processNups) override; double sumNups(double processNups) override; diff --git a/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp b/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp index 2bfbf90dd..8109766a3 100644 --- a/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp +++ b/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp @@ -272,12 +272,6 @@ public: void waitGPU(int id) override {}; void resetRequest() override {}; ////////////////////////////////////////////////////////////////////////// - void startTimer() override {}; - void stopTimer() override {}; - double getTime() override - { - return 0.0; - }; int mapCudaDevice(const int &rank, const int &size, const std::vector<unsigned int> &devices, const int &maxdev) override { return 0; -- GitLab