Fix Windows build compatibility (MSVC cl.exe and clang-cl) by lorisercole · Pull Request #99 · wavefunction91/IntegratorXX

lorisercole · 2026-05-07T13:46:18Z

Summary

Enable IntegratorXX to build and test cleanly with both MSVC cl.exe and clang-cl on Windows.

Compiler compatibility fixes

Fix MSVC C1061 'blocks nested too deeply' in womersley.hpp: split 125-branch if-else dispatch into two halves; replace another with a 3-line clamp
Replace C++ alternative operator tokens (and, or, not) with &&, ||, ! across 11 headers (MSVC requires /permissive- otherwise)
Add _USE_MATH_DEFINES for M_PI and /bigobj for large test translation units

MSVC warning fixes (all fixed at source)

C4242/C4244: ::toupper returns int — use explicit unsigned char cast lambda in std::transform; explicit static_cast for size_t→point_type in Gauss-Legendre/Gauss-Lobatto and factorial→double in SphericalHarmonic
C4267: size_t→int narrowing — use int in ref_value lambdas; cast size_t to ptrdiff_t in spherical_micro_batcher::at(); cast for custom iterator::operator+(int)
C4530: add /EHsc to IntegratorXX and FetchContent'd Catch2 targets

clang-cl warning fixes

Suppress -Wno-unused-but-set-variable and -Wno-suggest-override
Fix -Wno-missing-braces scope: was INTERFACE (consumers only), now matches INTEGRATORXX_TARGET_TYPE so compiled library sources also receive it

Other

Add missing #include <numeric> in composite quadratures test
Cast loop index to size_t in quadrature_traits to avoid downstream C4267 in GauXC

MSVC has a hard limit of ~128 nesting levels for if-else chains. The Womersley quadrature traits had two functions exceeding this: - generate(): ~125-branch if-else dispatch. Split into two halves by extracting npts >= 2049 into a generate_large_npts_() helper, keeping each half under 64 branches. - next_algebraic_order(): ~125-branch if-else that simply returned the input clamped to [1, 125]. Replaced with a 3-line equivalent.

MSVC does not support C++ alternative operator tokens (and, or, not) without /permissive-. Replace with standard &&, ||, ! across all headers (11 files). Also add MSVC-specific flags to CMakeLists.txt: - _USE_MATH_DEFINES: needed for M_PI in MSVC CRT - /bigobj: test TUs exceed default COFF section limit

The flag was hardcoded as INTERFACE, which only propagates to consumers. When IntegratorXX builds as a compiled library (INTEGRATORXX_HEADER_ONLY=OFF), its own sources never received the suppression. Use INTEGRATORXX_TARGET_TYPE (PUBLIC or INTERFACE) so it matches the other target_compile_options calls. GCC hides this because it removed -Wmissing-braces from -Wall in GCC 4.8; Clang still enables it, causing thousands of warnings on clang-cl builds.

Copilot

Pull request overview

This PR improves Windows build compatibility (MSVC cl.exe and clang-cl) by reducing MSVC parser limits in large dispatch code paths, avoiding C++ alternative operator tokens, and adjusting CMake compile options/definitions to apply correctly for both header-only and compiled-library builds.

Changes:

Refactors the large Womersley npts dispatch and simplifies next_algebraic_order to avoid MSVC C1061 nesting limits.
Replaces alternative operator tokens (and, or, not) with &&, ||, ! across multiple headers for MSVC compatibility.
Updates CMake to apply warning suppressions correctly and adds MSVC-specific flags/definitions; adds a missing <numeric> include to a test TU.

Reviewed changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
CMakeLists.txt	Applies `-Wno-missing-braces` with the correct target scope; adds MSVC/clang-cl-specific flags/defs.
test/composite_quadratures.cxx	Adds missing `<numeric>` include for algorithms used in the test.
include/integratorxx/util/bound_transform.hpp	Replaces alternative tokens with standard logical operators.
include/integratorxx/quadratures/s2/womersley.hpp	Splits large `if/else` dispatch and clamps `next_algebraic_order` to avoid MSVC nesting-depth limits.
include/integratorxx/quadratures/radial/treutlerahlrichs.hpp	Replaces alternative tokens with `&&`.
include/integratorxx/quadratures/radial/muraknowles.hpp	Replaces alternative tokens with `&&`.
include/integratorxx/quadratures/radial/mhl.hpp	Replaces alternative tokens with `&&`.
include/integratorxx/quadratures/radial/becke.hpp	Replaces alternative tokens with `&&`.
include/integratorxx/quadratures/primitive/gausslobatto.hpp	Replaces `not` with `!` in convergence check.
include/integratorxx/quadratures/primitive/gausslegendre.hpp	Replaces `not` with `!` in convergence check.
include/integratorxx/quadrature.hpp	Replaces `and` with `&&` in SFINAE constraints.
include/integratorxx/generators/spherical_factory.hpp	Replaces alternative tokens with `&&` in equality operators.
include/integratorxx/composite_quadratures/pruned_spherical_quadrature.hpp	Replaces alternative tokens with `&&` / `!` in iterator comparisons.
include/integratorxx/batch/spherical_micro_batcher.hpp	Replaces alternative tokens with `

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

…eption handling

…har lambda

…ss-Legendre and Gauss-Lobatto

…92int narrowing

…batcher::at()

…ize_t→int for custom iterator::operator+(int)

lorisercole · 2026-06-05T15:16:25Z

Just adapted the build with MSVC cl and clang-cl to comply with Microsoft 1CS corporate policies.

-DCMAKE_CXX_FLAGS="/W3 /w14018 /w14055 /w14100 /w14102 /w14127 /w14146 /w14242 /w14244 /w14245 /w14254 /w14267 /w14302 /w14306 /w14308 /w14310 /w14389 /w14509 /w14510 /w14512 /w14532 /w14533 /w14610 /w14611 /w14700 /w14701 /w14703 /w14789 /w14995 /w14996" `
-DCMAKE_CXX_FLAGS_RELEASE="/O2 /DNDEBUG" `

+ same for C flags

…rning in GauXC

lorisercole added 5 commits April 27, 2026 14:46

silence noisy warnings

60e45e7

Add missing numeric header for composite quadratures tests

58012a0

This was referenced May 7, 2026

Fix Windows build compatibility (MSVC cl.exe and clang-cl) wavefunction91/GauXC#201

Merged

Add Windows build support with clang-cl and vcpkg microsoft/qdk-chemistry#450

Open

wavefunction91 requested a review from Copilot May 7, 2026 15:14

Copilot started reviewing on behalf of wavefunction91 May 7, 2026 15:15 View session

Copilot AI reviewed May 7, 2026

View reviewed changes

Comment thread include/integratorxx/generators/spherical_factory.hpp

Comment thread include/integratorxx/batch/spherical_micro_batcher.hpp

Potential fix for pull request finding

357af6f

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

wavefunction91 approved these changes May 23, 2026

View reviewed changes

lorisercole added 8 commits June 5, 2026 16:06

fix(msvc): C4530 — add /EHsc via add_compile_options for standard exc…

76b5ae5

…eption handling

fix(msvc): C4242 — ::toupper returns int; cast to char via unsigned c…

b2fe887

…har lambda

fix(msvc): C4244 — explicit static_cast size_t\u2192point_type in Gau…

a7d2823

…ss-Legendre and Gauss-Lobatto

fix(msvc): C4244 — cast factorial result to double in SphericalHarmonic

c2fcc86

fix(msvc): C4267 — use int p in ref_value lambdas to avoid size_t\u21…

489307b

…92int narrowing

fix(msvc): C4267 — cast size_t index to ptrdiff_t in spherical_micro_…

79bf569

…batcher::at()

fix(msvc): C4530/C4267 — move /EHsc to target_compile_options; cast s…

28d8ad5

…ize_t→int for custom iterator::operator+(int)

fix(msvc): C4530 — add /EHsc to FetchContent Catch2 targets

81e283d

fix(msvc): cast loop index to size_t in quadrature_traits to avoid wa…

9231252

…rning in GauXC

wavefunction91 approved these changes Jun 11, 2026

View reviewed changes

wavefunction91 merged commit 619d26a into wavefunction91:master Jun 11, 2026
8 checks passed

lorisercole deleted the fix/msvc-build branch June 12, 2026 08:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Windows build compatibility (MSVC cl.exe and clang-cl)#99

Fix Windows build compatibility (MSVC cl.exe and clang-cl)#99
wavefunction91 merged 15 commits into
wavefunction91:masterfrom
lorisercole:fix/msvc-build

lorisercole commented May 7, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

lorisercole commented Jun 5, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

lorisercole commented May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Compiler compatibility fixes

MSVC warning fixes (all fixed at source)

clang-cl warning fixes

Other

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

lorisercole commented Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

lorisercole commented May 7, 2026 •

edited

Loading

lorisercole commented Jun 5, 2026 •

edited

Loading