Adds change for duplicate variables (#3065)

Co-authored-by: David Clark <daclark@nvidia.com>

Adds change for duplicate variables (#3065)
Co-authored-by: David Clark <daclark@nvidia.com>
b2d3359a · David Clark · GitHub · 59b8afb1 · b2d3359a · b2d3359a
Unverified Commit b2d3359a authored Mar 16, 2021 by David Clark Committed by GitHub Mar 16, 2021
Show whitespace changes
Inline Side-by-side

Showing with 14 additions and 8 deletions

platforms/cuda/src/CudaContext.cpp platforms/cuda/src/CudaContext.cpp +7 -4

platforms/opencl/src/OpenCLContext.cpp platforms/opencl/src/OpenCLContext.cpp +7 -4

No files found.
--- a/platforms/cuda/src/CudaContext.cpp
+++ b/platforms/cuda/src/CudaContext.cpp
@@ -489,11 +489,14 @@ CUmodule CudaContext::createModule(const string source, const map<string, string
    if (!options.empty())
        src << "// Compilation Options: " << options << endl << endl;
    for (auto& pair : compilationDefines) {
+        // Query defines to avoid duplicate variables
+        if (defines.find(pair.first) == defines.end()) {
            src << "#define " << pair.first;
            if (!pair.second.empty())
                src << " " << pair.second;
            src << endl;
        }
+    }
    if (!compilationDefines.empty())
        src << endl;
    if (useDoublePrecision) {

--- a/platforms/opencl/src/OpenCLContext.cpp
+++ b/platforms/opencl/src/OpenCLContext.cpp
@@ -572,11 +572,14 @@ cl::Program OpenCLContext::createProgram(const string source, const map<string,
    if (!options.empty())
        src << "// Compilation Options: " << options << endl << endl;
    for (auto& pair : compilationDefines) {
+        // Query defines to avoid duplicate variables
+        if (defines.find(pair.first) == defines.end()) {
            src << "#define " << pair.first;
            if (!pair.second.empty())
                src << " " << pair.second;
            src << endl;
        }
+    }
    if (!compilationDefines.empty())
        src << endl;
    if (supportsDoublePrecision)