Merge pull request #74 from oneapi-src/ratul/cudasift/inputdataloc

[cudasift] command line option for input data loc

Author: rmukhopa

cudaSift/CUDA/CMakeLists.txt

@@ -52,12 +52,17 @@ set(cuda_sources
 
 set(sources
   ${CMAKE_SOURCE_DIR}/../common/Utility.cpp
+  ${CMAKE_SOURCE_DIR}/../common/workload_params.cpp
+  ${CMAKE_SOURCE_DIR}/../../infrastructure/CommandLineParser.cpp
+  ${CMAKE_SOURCE_DIR}/../../infrastructure/TestBenchBase.cpp
+  ${CMAKE_SOURCE_DIR}/../../infrastructure/Utilities.cpp  
   geomFuncs.cpp  
   mainSift.cpp  
 )
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/../common/
+  ${CMAKE_SOURCE_DIR}/../../infrastructure
   ${CMAKE_CURRENT_SOURCE_DIR} 
 )
 if(DEVICE_TIMER)

cudaSift/CUDA/mainSift.cpp

@@ -38,6 +38,9 @@
 #include "Utility.h"
 #include "cudaImage.h"
 #include "cudaSift.h"
+#include "../common/workload_params.h"
+#include "Utilities.h"
+#include "CommandLineParser.h"
 
 int ImproveHomography(SiftData &data, float *homography, int numLoops, float minScore, float maxAmbiguity, float thresh);
 void PrintMatchData(SiftData &siftData1, SiftData &siftData2, CudaImage &img);
@@ -48,7 +51,7 @@ double ScaleUp(CudaImage &res, CudaImage &src);
 ///////////////////////////////////////////////////////////////////////////////
 // Main program
 ///////////////////////////////////////////////////////////////////////////////
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
   auto totalProgTimer_start = std::chrono::steady_clock::now();
   int devNum = 0, imgSet = 0;
@@ -57,6 +60,9 @@ int main(int argc, char **argv)
   if (argc > 2)
     imgSet = std::atoi(argv[2]);
 
+  common::WorkloadParams workload_params(argc, argv);
+  std::string inputDataLoc = workload_params.getInputDataLoc();
+
   float totTime = 0.0;
   float imageInitTime = 0.0;
   float extractSiftTime = 0.0;
@@ -78,13 +84,13 @@ int main(int argc, char **argv)
 	  std::string inp_file_1, inp_file_2;
     if (imgSet)
     {
-      inp_file_1 = "../../inputData/left.pgm";
-      inp_file_2 = "../../inputData/righ.pgm";
+      inp_file_1 = inputDataLoc + "/left.pgm";
+      inp_file_2 = inputDataLoc + "/righ.pgm";
     }
     else
     {
-      inp_file_1 = "../../inputData/img1.png";
-      inp_file_2 = "../../inputData/img2.png";
+      inp_file_1 = inputDataLoc + "/img1.png";
+      inp_file_2 = inputDataLoc + "/img2.png";
     }
 
     if (!std::filesystem::exists(inp_file_1))

cudaSift/HIP/CMakeLists.txt

@@ -57,6 +57,10 @@ include_directories(${OpenCV_INCLUDE_DIRS})
 
 set(SOURCES
   ${CMAKE_SOURCE_DIR}/../common/Utility.cpp
+  ${CMAKE_SOURCE_DIR}/../common/workload_params.cpp
+  ${CMAKE_SOURCE_DIR}/../../infrastructure/CommandLineParser.cpp
+  ${CMAKE_SOURCE_DIR}/../../infrastructure/TestBenchBase.cpp
+  ${CMAKE_SOURCE_DIR}/../../infrastructure/Utilities.cpp  
   cudaImage.cpp
   cudaImage.h
   cudaSiftH.cpp
@@ -71,6 +75,7 @@ set(SOURCES
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/../common/
+  ${CMAKE_SOURCE_DIR}/../../infrastructure
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${HIP_INCLUDE_DIRS}
 )

cudaSift/HIP/mainSift.cpp

@@ -38,6 +38,9 @@
 #include "Utility.h"
 #include "cudaImage.h"
 #include "cudaSift.h"
+#include "../common/workload_params.h"
+#include "Utilities.h"
+#include "CommandLineParser.h"
 
 int ImproveHomography(SiftData &data, float *homography, int numLoops, float minScore, float maxAmbiguity, float thresh);
 void PrintMatchData(SiftData &siftData1, SiftData &siftData2, CudaImage &img);
@@ -48,7 +51,7 @@ double ScaleUp(CudaImage &res, CudaImage &src);
 ///////////////////////////////////////////////////////////////////////////////
 // Main program
 ///////////////////////////////////////////////////////////////////////////////
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
   auto totalProgTimer_start = std::chrono::steady_clock::now();
   int devNum = 0, imgSet = 0;
@@ -57,6 +60,9 @@ int main(int argc, char **argv)
   if (argc > 2)
     imgSet = std::atoi(argv[2]);
 
+  common::WorkloadParams workload_params(argc, argv);
+  std::string inputDataLoc = workload_params.getInputDataLoc();
+
   float totTime = 0.0;
   float imageInitTime = 0.0;
   float extractSiftTime = 0.0;
@@ -78,13 +84,13 @@ int main(int argc, char **argv)
     std::string inp_file_1, inp_file_2;
     if (imgSet)
     {
-      inp_file_1 = "../../inputData/left.pgm";
-      inp_file_2 = "../../inputData/righ.pgm";
+      inp_file_1 = inputDataLoc + "/left.pgm";
+      inp_file_2 = inputDataLoc + "/righ.pgm";
     }
     else
     {
-      inp_file_1 = "../../inputData/img1.png";
-      inp_file_2 = "../../inputData/img2.png";
+      inp_file_1 = inputDataLoc + "/img1.png";
+      inp_file_2 = inputDataLoc + "/img2.png";
     }
 
     if (!std::filesystem::exists(inp_file_1))

cudaSift/README.md

@@ -90,3 +90,15 @@ ONEAPI_DEVICE_SELECTOR=hip:* ./cudaSift
 **To run hip version**
 
 ./cudasift
+
+
+
+
+***NOTE: Regarding default input files location:***
+
+Input files for this workload are located at cudaSift/inputData by default. \
+If this needs to be changed, please use the following command line argument to provide the path of a different location: 
+
+./cudasift **-input_data_loc**  <INPUT_FILES_DIR> 
+
+

cudaSift/SYCL/CMakeLists.txt

@@ -55,6 +55,10 @@ endif()
 
 set(SOURCES
     ${CMAKE_SOURCE_DIR}/../common/Utility.cpp
+    ${CMAKE_SOURCE_DIR}/../common/workload_params.cpp
+    ${CMAKE_SOURCE_DIR}/../../infrastructure/CommandLineParser.cpp
+    ${CMAKE_SOURCE_DIR}/../../infrastructure/TestBenchBase.cpp
+    ${CMAKE_SOURCE_DIR}/../../infrastructure/Utilities.cpp  
     cudaImage.dp.cpp
     cudaImage.h
     cudaSiftH.dp.cpp
@@ -68,6 +72,7 @@ set(SOURCES
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/../common/
+    ${CMAKE_SOURCE_DIR}/../../infrastructure
     ${CMAKE_SOURCE_DIR}
     ${OpenCV_INCLUDE_DIRS}
 )

cudaSift/SYCL/mainSift.cpp

@@ -38,6 +38,9 @@
 #include "cudaSift.h"
 #include "infra/infra.hpp"
 #include "Utility.h"
+#include "../common/workload_params.h"
+#include "Utilities.h"
+#include "CommandLineParser.h"
 
 #ifndef KERNEL_USE_PROFILE
 #define KERNEL_USE_PROFILE 0
@@ -53,7 +56,7 @@ double ScaleUp(CudaImage &res, CudaImage &src);
 ///////////////////////////////////////////////////////////////////////////////
 // Main program
 ///////////////////////////////////////////////////////////////////////////////
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
   auto totalProgTimer_start = std::chrono::steady_clock::now();
   int devNum = 0, imgSet = 0;
@@ -62,6 +65,9 @@ int main(int argc, char **argv)
   if (argc > 2)
     imgSet = std::atoi(argv[2]);
 
+  common::WorkloadParams workload_params(argc, argv);
+  std::string inputDataLoc = workload_params.getInputDataLoc();
+
   float totTime = 0.0;
   float imageInitTime = 0.0;
   float extractSiftTime = 0.0;
@@ -91,13 +97,13 @@ int main(int argc, char **argv)
     std::string inp_file_1, inp_file_2;
     if (imgSet)
     {
-      inp_file_1 = "../../inputData/left.pgm";
-      inp_file_2 = "../../inputData/righ.pgm";
+      inp_file_1 = inputDataLoc + "/left.pgm";
+      inp_file_2 = inputDataLoc + "/righ.pgm";
     }
     else
     {
-      inp_file_1 = "../../inputData/img1.png";
-      inp_file_2 = "../../inputData/img2.png";
+      inp_file_1 = inputDataLoc + "/img1.png";
+      inp_file_2 = inputDataLoc + "/img2.png";
     }
 
     if (!std::filesystem::exists(inp_file_1))

cudaSift/common/workload_params.cpp

@@ -0,0 +1,58 @@
+/* Copyright (C) 2023 Intel Corporation
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+ * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+ * OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "CommandLineParser.h"
+#include "TestBenchBase.h"
+#include "Logging.h"
+#include "workload_params.h"
+#include <iostream>
+#include <vector>
+#include <string>
+#include <algorithm>
+
+//#define CPP_MODULE "WL PARAMS"
+
+using namespace std;
+
+namespace common {
+    WorkloadParams::WorkloadParams(int argc, const char** argv): TestBenchBase()
+    {
+        bool bRequired(true);
+        VelocityBench::CommandLineParser &parser = GetCmdLineParser();
+        parser.AddSetting("-input_data_loc", "Input data location",  !bRequired, "../../inputData",  VelocityBench::CommandLineParser::InputType_t::STRING, 1);
+
+        ParseCommandLineArguments(argc, argv);
+        parseInputParameters(parser);    
+    }
+
+    void WorkloadParams::parseInputParameters(const VelocityBench::CommandLineParser& parser) {
+        inputDataLoc                 = parser.GetSetting("-input_data_loc");
+
+        LOG( "\n");
+        LOG( "==================================================");
+        LOG("User input parameters:"); 
+        LOG("Trace:                             "   << inputDataLoc);
+        LOG( "==================================================");
+        LOG( "\n");
+    }
+}

cudaSift/common/workload_params.h

@@ -0,0 +1,55 @@
+/* Copyright (C) 2023 Intel Corporation
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+ * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+ * OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef CUDASIFT_WL_PARAMS_H
+#define CUDASIFT_WL_PARAMS_H
+
+#include "TestBenchBase.h"
+#include <string>
+
+using namespace std;
+
+namespace common {
+    class WorkloadParams : public TestBenchBase 
+    {
+        public:
+
+        private:
+            string inputDataLoc;
+
+        public:
+            WorkloadParams(int argc, const char** argv);
+            ~WorkloadParams(){;} 
+
+            //WorkloadParams           (WorkloadParams const &RHS) = delete;
+            //WorkloadParams &operator=(WorkloadParams const &RHS) = delete;
+            void initializeCmdParser();
+            string getInputDataLoc() { return inputDataLoc;}
+
+        private:
+            void parseInputParameters(const VelocityBench::CommandLineParser& parser);
+
+    };
+}
+
+#endif