Conversation
erichkeane
reviewed
Mar 17, 2020
Contributor
erichkeane
left a comment
There was a problem hiding this comment.
The canonical way to do this is to require users of the windows.h header to #define NOMINMAX. That is the way the standard library handles it on windows (and I believe the IDE does by default in many cases).
b278807 to
a8471d8
Compare
Contributor
|
Adding braces around min and max function declaration inside the SYCL doesn't help?: |
romanovvlad
suggested changes
Mar 22, 2020
Contributor
Author
|
The order of the macros (first "windows.h" then "CL/sycl.hpp" ) is necessary for proper testing |
romanovvlad
reviewed
Mar 24, 2020
Contributor
|
@MochalovaAn, please, fix code formatting issues by applying clang-format to the patch. |
Contributor
Author
The order of the macros (first "windows.h" then "CL/sycl.hpp" ) is necessary for proper testing |
bader
reviewed
Mar 25, 2020
468cceb to
2d9ab28
Compare
bader
reviewed
Mar 27, 2020
Contributor
|
@MochalovaAn, please, take a look at LIT test failure on Windows platform. |
Adding #undef macros to resolve conflict between definitions of the min and max function in the CL/sycl.h and windows.h or another min and max define. confict type from sycl and windows.h Signed-off-by: Mochalova <anastasiya.mochalova@intel.com>
Use adding brackets around min & max function declarations instead of macros Signed-off-by: Mochalova <anastasiya.mochalova@intel.com>
Signed-off-by: amochalo <anastasiya.mochalova@intel.com>
Signed-off-by: amochalo <anastasiya.mochalova@intel.com>
Signed-off-by: amochalo <anastasiya.mochalova@intel.com>
Signed-off-by: Mochalova <anastasiya.mochalova@intel.com>
Signed-off-by: Mochalova <anastasiya.mochalova@intel.com>
Signed-off-by: Mochalova <anastasiya.mochalova@intel.com> Co-Authored-By: Alexey Bader <alexey.bader@intel.com>
Signed-off-by: Mochalova <anastasiya.mochalova@intel.com>
Signed-off-by: Mochalova <anastasiya.mochalova@intel.com>
baad1c1 to
8089ee0
Compare
bader
reviewed
Apr 1, 2020
Signed-off-by: Mochalova <anastasiya.mochalova@intel.com>
bader
reviewed
Apr 1, 2020
Signed-off-by: Mochalova <anastasiya.mochalova@intel.com>
Contributor
|
@romanovvlad, please, review. |
romanovvlad
approved these changes
Apr 2, 2020
alexbatashev
pushed a commit
to alexbatashev/llvm
that referenced
this pull request
Apr 6, 2020
…_private_api * origin/sycl: (614 commits) [SYCL][Doc] Update prerequisites in GetStartedGuide (intel#1466) [SYCL][USM] Remove vestigial dead code (intel#1474) [SYCL-PTX] Fix __spirv_GroupAsyncCopy stride computation (intel#1451) [Driver][SYCL] Emit an error if c compilation is forced (intel#1438) [SYCL] Fix sycl-post-link when no split and symbols are requested. (intel#1454) [SYCL] Change priority of devices in default_selector (intel#1264) [CI] Update CODEOWNERS matching rules order (intel#1468) [SYCL] Share PFWG lambda object through shared memory (intel#1455) [CI] Fix CODEOWNERS file syntax (intel#1464) [SYCL][CUDA] Fix active context when creating base event (intel#1447) [SYCL] Diagnose implicit declaration of kernel function type (intel#1450) [BuildBot] Modify configure script (intel#1421) [SYCL] Resolve min/max conflict (intel#1339) [CI][BuildBot] Fix configure parameter to turn on/off assertions (intel#1449) [SYCL] XFAIL LIT test due to duplicate diagnostic [SYCL] Remove explicit sycl_device attribute requirement Apply more suggestions Apply suggestions Translate new set of Intel FPGA Loop Controls Translate Intel FPGA force_pow2_depth memory attribute ...
AlexeySachkov
pushed a commit
that referenced
this pull request
Sep 23, 2022
Resolve min/max conflict in the same way as it was done here: #1339 Needed to fix this failure: https://github.com/intel/llvm/actions/runs/3107743966/jobs/5036187282
againull
added a commit
that referenced
this pull request
Dec 13, 2022
Fix conflict with min/max macro on Windows in a similar way as in the #1339 This is needed to fix post-commit failure - https://github.com/intel/llvm/actions/runs/3687931956/jobs/6242122359
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adding #undef macros to resolve conflict between definitions of the min
and max function in the CL/sycl.h and windows.h or another min and max
define.
Signed-off-by: Mochalova anastasiya.mochalova@intel.com