From 90632045e3d4153e9ff3715bb5181f3fd59f1069 Mon Sep 17 00:00:00 2001 From: mdoijade Date: Thu, 15 Mar 2018 19:48:48 +0530 Subject: [PATCH] add github cuda samples specific search paths in sdkFindFilePath() and remove all the redundant paths from p4 samples world bug: 200397368 --- Common/helper_string.h | 352 ++--------------------------------------- 1 file changed, 9 insertions(+), 343 deletions(-) diff --git a/Common/helper_string.h b/Common/helper_string.h index 050302a8..13df3d8b 100644 --- a/Common/helper_string.h +++ b/Common/helper_string.h @@ -249,7 +249,7 @@ inline bool getCmdLineArgumentString(const int argc, const char **argv, if (argc >= 1) { for (int i = 1; i < argc; i++) { int string_start = stringRemoveDelimiter('-', argv[i]); - char *string_argv = const_cast(&argv[i][string_start]); + char *string_argv = const_cast(&argv[i][string_start]); int length = static_cast(strlen(string_ref)); if (!STRNCASECMP(string_argv, string_ref, length)) { @@ -285,348 +285,14 @@ inline char *sdkFindFilePath(const char *filename, // the .exe file, a .bat file launching an .exe, a browser .exe launching the // .exe or .bat, etc const char *searchPath[] = { - "./", // same dir - "./_data_files/", - "./common/", // "/common/" subdir - "./common/data/", // "/common/data/" subdir - "./data/", // "/data/" subdir - "./src/", // "/src/" subdir - "./src//data/", // "/src//data/" subdir - "./inc/", // "/inc/" subdir - "./0_Simple/", // "/0_Simple/" subdir - "./1_Utilities/", // "/1_Utilities/" subdir - "./2_Graphics/", // "/2_Graphics/" subdir - "./3_Imaging/", // "/3_Imaging/" subdir - "./4_Finance/", // "/4_Finance/" subdir - "./5_Simulations/", // "/5_Simulations/" subdir - "./6_Advanced/", // "/6_Advanced/" subdir - "./7_CUDALibraries/", // "/7_CUDALibraries/" subdir - "./8_Android/", // "/8_Android/" subdir - "./samples/", // "/samples/" subdir - - "./0_Simple//data/", // "/0_Simple//data/" - // subdir - "./1_Utilities//data/", // "/1_Utilities//data/" - // subdir - "./2_Graphics//data/", // "/2_Graphics//data/" - // subdir - "./3_Imaging//data/", // "/3_Imaging//data/" - // subdir - "./4_Finance//data/", // "/4_Finance//data/" - // subdir - "./5_Simulations//data/", // "/5_Simulations//data/" - // subdir - "./6_Advanced//data/", // "/6_Advanced//data/" - // subdir - "./7_CUDALibraries//", // "/7_CUDALibraries//" - // subdir - "./7_CUDALibraries//data/", // "/7_CUDALibraries//data/" - // subdir - - "../", // up 1 in tree - "../common/", // up 1 in tree, "/common/" subdir - "../common/data/", // up 1 in tree, "/common/data/" subdir - "../data/", // up 1 in tree, "/data/" subdir - "../src/", // up 1 in tree, "/src/" subdir - "../inc/", // up 1 in tree, "/inc/" subdir - - "../0_Simple//data/", // up 1 in tree, - // "/0_Simple//" - // subdir - "../1_Utilities//data/", // up 1 in tree, - // "/1_Utilities//" - // subdir - "../2_Graphics//data/", // up 1 in tree, - // "/2_Graphics//" - // subdir - "../3_Imaging//data/", // up 1 in tree, - // "/3_Imaging//" - // subdir - "../4_Finance//data/", // up 1 in tree, - // "/4_Finance//" - // subdir - "../5_Simulations//data/", // up 1 in tree, - // "/5_Simulations//" - // subdir - "../6_Advanced//data/", // up 1 in tree, - // "/6_Advanced//" - // subdir - "../7_CUDALibraries//data/", // up 1 in tree, - // "/7_CUDALibraries//" - // subdir - "../8_Android//data/", // up 1 in tree, - // "/8_Android//" - // subdir - "../samples//data/", // up 1 in tree, - // "/samples//" - // subdir - "../../", // up 2 in tree - "../../common/", // up 2 in tree, "/common/" subdir - "../../common/data/", // up 2 in tree, "/common/data/" subdir - "../../data/", // up 2 in tree, "/data/" subdir - "../../src/", // up 2 in tree, "/src/" subdir - "../../inc/", // up 2 in tree, "/inc/" subdir - "../../sandbox//data/", // up 2 in tree, - // "/sandbox//" - // subdir - "../../0_Simple//data/", // up 2 in tree, - // "/0_Simple//" - // subdir - "../../1_Utilities//data/", // up 2 in tree, - // "/1_Utilities//" - // subdir - "../../2_Graphics//data/", // up 2 in tree, - // "/2_Graphics//" - // subdir - "../../3_Imaging//data/", // up 2 in tree, - // "/3_Imaging//" - // subdir - "../../4_Finance//data/", // up 2 in tree, - // "/4_Finance//" - // subdir - "../../5_Simulations//data/", // up 2 in tree, - // "/5_Simulations//" - // subdir - "../../6_Advanced//data/", // up 2 in tree, - // "/6_Advanced//" - // subdir - "../../7_CUDALibraries//data/", // up 2 in tree, - // "/7_CUDALibraries//" - // subdir - "../../8_Android//data/", // up 2 in tree, - // "/8_Android//" - // subdir - "../../samples//data/", // up 2 in tree, - // "/samples//" - // subdir - "../../../", // up 3 in tree - "../../../src//", // up 3 in tree, - // "/src//" subdir - "../../../src//data/", // up 3 in tree, - // "/src//data/" - // subdir - "../../../src//src/", // up 3 in tree, - // "/src//src/" - // subdir - "../../../src//inc/", // up 3 in tree, - // "/src//inc/" - // subdir - "../../../sandbox//", // up 3 in tree, - // "/sandbox//" - // subdir - "../../../sandbox//data/", // up 3 in tree, - // "/sandbox//data/" - // subdir - "../../../sandbox//src/", // up 3 in tree, - // "/sandbox//src/" - // subdir - "../../../sandbox//inc/", // up 3 in tree, - // "/sandbox//inc/" - // subdir - "../../../0_Simple//data/", // up 3 in tree, - // "/0_Simple//" - // subdir - "../../../1_Utilities//data/", // up 3 in tree, - // "/1_Utilities//" - // subdir - "../../../2_Graphics//data/", // up 3 in tree, - // "/2_Graphics//" - // subdir - "../../../3_Imaging//data/", // up 3 in tree, - // "/3_Imaging//" - // subdir - "../../../4_Finance//data/", // up 3 in tree, - // "/4_Finance//" - // subdir - "../../../5_Simulations//data/", // up 3 in tree, - // "/5_Simulations//" - // subdir - "../../../6_Advanced//data/", // up 3 in tree, - // "/6_Advanced//" - // subdir - "../../../7_CUDALibraries//data/", // up 3 in tree, - // "/7_CUDALibraries//" - // subdir - "../../../8_Android//data/", // up 3 in tree, - // "/8_Android//" - // subdir - "../../../0_Simple//", // up 3 in tree, - // "/0_Simple//" - // subdir - "../../../1_Utilities//", // up 3 in tree, - // "/1_Utilities//" - // subdir - "../../../2_Graphics//", // up 3 in tree, - // "/2_Graphics//" - // subdir - "../../../3_Imaging//", // up 3 in tree, - // "/3_Imaging//" - // subdir - "../../../4_Finance//", // up 3 in tree, - // "/4_Finance//" - // subdir - "../../../5_Simulations//", // up 3 in tree, - // "/5_Simulations//" - // subdir - "../../../6_Advanced//", // up 3 in tree, - // "/6_Advanced//" - // subdir - "../../../7_CUDALibraries//", // up 3 in tree, - // "/7_CUDALibraries//" - // subdir - "../../../8_Android//", // up 3 in tree, - // "/8_Android//" - // subdir - "../../../samples//data/", // up 3 in tree, - // "/samples//" - // subdir - "../../../common/", // up 3 in tree, "../../../common/" subdir - "../../../common/data/", // up 3 in tree, "../../../common/data/" subdir - "../../../data/", // up 3 in tree, "../../../data/" subdir - "../../../../", // up 4 in tree - "../../../../src//", // up 4 in tree, - // "/src//" subdir - "../../../../src//data/", // up 4 in tree, - // "/src//data/" - // subdir - "../../../../src//src/", // up 4 in tree, - // "/src//src/" - // subdir - "../../../../src//inc/", // up 4 in tree, - // "/src//inc/" - // subdir - "../../../../sandbox//", // up 4 in tree, - // "/sandbox//" - // subdir - "../../../../sandbox//data/", // up 4 in tree, - // "/sandbox//data/" - // subdir - "../../../../sandbox//src/", // up 4 in tree, - // "/sandbox//src/" - // subdir - "../../../../sandbox//inc/", // up 4 in tree, - // "/sandbox//inc/" - // subdir - "../../../../0_Simple//data/", // up 4 in tree, - // "/0_Simple//" - // subdir - "../../../../1_Utilities//data/", // up 4 in tree, - // "/1_Utilities//" - // subdir - "../../../../2_Graphics//data/", // up 4 in tree, - // "/2_Graphics//" - // subdir - "../../../../3_Imaging//data/", // up 4 in tree, - // "/3_Imaging//" - // subdir - "../../../../4_Finance//data/", // up 4 in tree, - // "/4_Finance//" - // subdir - "../../../../5_Simulations//data/", // up 4 in tree, - // "/5_Simulations//" - // subdir - "../../../../6_Advanced//data/", // up 4 in tree, - // "/6_Advanced//" - // subdir - "../../../../7_CUDALibraries//data/", // up 4 in tree, - // "/7_CUDALibraries//" - // subdir - "../../../../8_Android//data/", // up 4 in tree, - // "/8_Android//" - // subdir - "../../../../0_Simple//", // up 4 in tree, - // "/0_Simple//" - // subdir - "../../../../1_Utilities//", // up 4 in tree, - // "/1_Utilities//" - // subdir - "../../../../2_Graphics//", // up 4 in tree, - // "/2_Graphics//" - // subdir - "../../../../3_Imaging//", // up 4 in tree, - // "/3_Imaging//" - // subdir - "../../../../4_Finance//", // up 4 in tree, - // "/4_Finance//" - // subdir - "../../../../5_Simulations//", // up 4 in tree, - // "/5_Simulations//" - // subdir - "../../../../6_Advanced//", // up 4 in tree, - // "/6_Advanced//" - // subdir - "../../../../7_CUDALibraries//", // up 4 in tree, - // "/7_CUDALibraries//" - // subdir - "../../../../8_Android//", // up 4 in tree, - // "/8_Android//" - // subdir - "../../../../samples//data/", // up 4 in tree, - // "/samples//" - // subdir - "../../../../common/", // up 4 in tree, "../../../common/" subdir - "../../../../common/data/", // up 4 in tree, "../../../common/data/" - // subdir - "../../../../data/", // up 4 in tree, "../../../data/" subdir - "../../../../../", // up 5 in tree - "../../../../../src//", // up 5 in tree, - // "/src//" - // subdir - "../../../../../src//data/", // up 5 in tree, - // "/src//data/" - // subdir - "../../../../../src//src/", // up 5 in tree, - // "/src//src/" - // subdir - "../../../../../src//inc/", // up 5 in tree, - // "/src//inc/" - // subdir - "../../../../../sandbox//", // up 5 in tree, - // "/sandbox//" - // subdir - "../../../../../sandbox//data/", // up 5 in tree, - // "/sandbox//data/" - // subdir - "../../../../../sandbox//src/", // up 5 in tree, - // "/sandbox//src/" - // subdir - "../../../../../sandbox//inc/", // up 5 in tree, - // "/sandbox//inc/" - // subdir - "../../../../../0_Simple//data/", // up 5 in tree, - // "/0_Simple//" - // subdir - "../../../../../1_Utilities//data/", // up 5 in tree, - // "/1_Utilities//" - // subdir - "../../../../../2_Graphics//data/", // up 5 in tree, - // "/2_Graphics//" - // subdir - "../../../../../3_Imaging//data/", // up 5 in tree, - // "/3_Imaging//" - // subdir - "../../../../../4_Finance//data/", // up 5 in tree, - // "/4_Finance//" - // subdir - "../../../../../5_Simulations//data/", // up 5 in tree, - // "/5_Simulations//" - // subdir - "../../../../../6_Advanced//data/", // up 5 in tree, - // "/6_Advanced//" - // subdir - "../../../../../7_CUDALibraries//data/", // up 5 in - // tree, - // "/7_CUDALibraries//" - // subdir - "../../../../../8_Android//data/", // up 5 in tree, - // "/8_Android//" - // subdir - "../../../../../samples//data/", // up 5 in tree, - // "/samples//" - // subdir - "../../../../../common/", // up 5 in tree, "../../../common/" subdir - "../../../../../common/data/", // up 5 in tree, "../../../common/data/" - // subdir + "./", // same dir + "./data/", // same dir + "../../../../Samples//", // up 4 in tree + "../../../Samples//", // up 3 in tree + "../../Samples//", // up 2 in tree + "../../../../Samples//data/", // up 4 in tree + "../../../Samples//data/", // up 3 in tree + "../../Samples//data/", // up 2 in tree }; // Extract the executable name