aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove std::vector in favor of std::initializor_list in GPUTargets.h

Browse Source
This commit is contained in:
Evghenii Gaburov
2015-02-24 12:54:06 +01:00
parent b35b931e3b
commit f481a51f39
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ptxtools/GPUTargets.h
View File

@@ -36,5 +36,5 @@ met:
namespace GPUTargets namespace GPUTargets
{ {
static const std::vector<std::string> computeMode = {"sm_35", "sm_37"}; static const auto computeMode = {"sm_35", "sm_37"};
} }

4
ptxtools/ptxcc.cpp
View File

@@ -123,7 +123,7 @@ static void lUsage(const int ret)
fprintf(stdout, " [--arch=]\t\t\t GPU target architectures:\n"); fprintf(stdout, " [--arch=]\t\t\t GPU target architectures:\n");
fprintf(stdout, " \t\t\t\t "); fprintf(stdout, " \t\t\t\t ");
for (const auto& mode : GPUTargets::computeMode) for (const auto& mode : GPUTargets::computeMode)
fprintf(stdout, "%s ", mode.c_str()); fprintf(stdout, "%s ", mode);
fprintf(stdout, "\n"); fprintf(stdout, "\n");
fprintf(stdout, " [-o <name>]\t\t\t Output file name\n"); fprintf(stdout, " [-o <name>]\t\t\t Output file name\n");
fprintf(stdout, " [-Xnvcc=<arguments>]\t Arguments to pass through to \"nvcc\"\n"); fprintf(stdout, " [-Xnvcc=<arguments>]\t Arguments to pass through to \"nvcc\"\n");
@@ -137,7 +137,7 @@ int main(int _argc, char * _argv[])
char *argv[128]; char *argv[128];
lGetAllArgs(_argc, _argv, argc, argv); lGetAllArgs(_argc, _argv, argc, argv);
std::string arch = GPUTargets::computeMode.front(); std::string arch = *GPUTargets::computeMode.begin();
std::string filePTX; std::string filePTX;
std::string fileOBJ; std::string fileOBJ;
std::string extString = ".ptx"; std::string extString = ".ptx";

4
ptxtools/ptxgen.cpp
View File

@@ -223,7 +223,7 @@ static void lUsage(const int ret)
fprintf(stdout, " [--arch=]\t\t GPU target architectures:\n"); fprintf(stdout, " [--arch=]\t\t GPU target architectures:\n");
fprintf(stdout, " \t\t\t "); fprintf(stdout, " \t\t\t ");
for (const auto& mode : GPUTargets::computeMode) for (const auto& mode : GPUTargets::computeMode)
fprintf(stdout, "%s ", mode.c_str()); fprintf(stdout, "%s ", mode);
fprintf(stdout, "\n"); fprintf(stdout, "\n");
fprintf(stdout, " [-o <name>]\t\t Output file name\n"); fprintf(stdout, " [-o <name>]\t\t Output file name\n");
fprintf(stdout, " [-g]\t\t Enable generation of debuggin information \n"); fprintf(stdout, " [-g]\t\t Enable generation of debuggin information \n");
@@ -257,7 +257,7 @@ int main(int argc, char *argv[])
bool _useFastMath = false; bool _useFastMath = false;
bool _debug = false; bool _debug = false;
bool _verbose = false; bool _verbose = false;
std::string _arch = GPUTargets::computeMode.front(); std::string _arch = *GPUTargets::computeMode.begin();
std::string fileIR, filePTX; std::string fileIR, filePTX;
for (int i = 1; i < argc; ++i) for (int i = 1; i < argc; ++i)