mirror of
https://github.com/NVIDIA/cuda-samples.git
synced 2025-04-20 22:52:24 +08:00
Merge branch 'pr/103'
This commit is contained in:
commit
ef45aa0d4a
|
@ -421,7 +421,6 @@ inline char *sdkFindFilePath(const char *filename,
|
||||||
}
|
}
|
||||||
|
|
||||||
// File not found
|
// File not found
|
||||||
printf("\nerror: sdkFindFilePath: file <%s> not found!\n", filename);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,11 +49,6 @@
|
||||||
|
|
||||||
void compileFileToCUBIN(char *filename, int argc, char **argv, char **cubinResult,
|
void compileFileToCUBIN(char *filename, int argc, char **argv, char **cubinResult,
|
||||||
size_t *cubinResultSize, int requiresCGheaders) {
|
size_t *cubinResultSize, int requiresCGheaders) {
|
||||||
if (!filename) {
|
|
||||||
std::cerr << "\nerror: filename is empty for compileFileToCUBIN()!\n";
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
std::ifstream inputFile(filename,
|
std::ifstream inputFile(filename,
|
||||||
std::ios::in | std::ios::binary | std::ios::ate);
|
std::ios::in | std::ios::binary | std::ios::ate);
|
||||||
|
|
||||||
|
@ -116,12 +111,7 @@ void compileFileToCUBIN(char *filename, int argc, char **argv, char **cubinResul
|
||||||
|
|
||||||
compileOptions = "--include-path=";
|
compileOptions = "--include-path=";
|
||||||
|
|
||||||
char *strPath = sdkFindFilePath(HeaderNames, argv[0]);
|
std::string path = sdkFindFilePath(HeaderNames, argv[0]);
|
||||||
if (!strPath) {
|
|
||||||
std::cerr << "\nerror: header file " << HeaderNames << " not found!\n";
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
std::string path = strPath;
|
|
||||||
if (!path.empty()) {
|
if (!path.empty()) {
|
||||||
std::size_t found = path.find(HeaderNames);
|
std::size_t found = path.find(HeaderNames);
|
||||||
path.erase(found);
|
path.erase(found);
|
||||||
|
@ -130,7 +120,6 @@ void compileFileToCUBIN(char *filename, int argc, char **argv, char **cubinResul
|
||||||
"\nCooperativeGroups headers not found, please install it in %s "
|
"\nCooperativeGroups headers not found, please install it in %s "
|
||||||
"sample directory..\n Exiting..\n",
|
"sample directory..\n Exiting..\n",
|
||||||
argv[0]);
|
argv[0]);
|
||||||
exit(1);
|
|
||||||
}
|
}
|
||||||
compileOptions += path.c_str();
|
compileOptions += path.c_str();
|
||||||
compileParams[numCompileOptions] = reinterpret_cast<char *>(
|
compileParams[numCompileOptions] = reinterpret_cast<char *>(
|
||||||
|
|
Loading…
Reference in New Issue
Block a user