Restore windows CI by Lestropie · Pull Request #3387 · MRtrix3/mrtrix3

Lestropie · 2026-06-04T01:08:09Z

This PR is a merge of the changes in #3384 and #3386. Both changes must be in place for compilation to proceed in the CI check. Therefore I'm merging the two together in the hope of producing a PR that passes checks before merging.

Replace the namespace-scope thread-local MR::DWI::Tractography::rng with a function-local thread_local accessed via a rng() accessor, lazily constructed on first use. The previous extern thread_local definition triggered compilation failures under GCC 16 on Windows due to changes in thread-local storage handling; the Meyers idiom sidesteps that codepath while preserving identical per-thread semantics. All call sites across the seeding, algorithm, and tracking code were updated to invoke rng() accordingly. Session prompts: 1. > Implement a Meyers-style accessor function for variable > MR::DWI::Tractography::rng, to prevent compilation failures on Windows > due to TLS changes in GCC16. Generated-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

…tore_windows_ci

github-actions

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 41. Check the log or trigger a new build to see more.

github-actions · 2026-06-04T01:16:29Z

        }

-        if (uniform(rng) < val / max_val) {
+        if (uniform(rng()) < val / max_val) {


warning: no header providing "MR::DWI::Tractography::rng" is directly included [misc-include-cleaner]

cpp/core/dwi/tractography/algorithms/iFOD1.h:23:

- #include "dwi/tractography/tracking/method.h" + #include "dwi/tractography/rng.h" + #include "dwi/tractography/tracking/method.h"

github-actions · 2026-06-04T01:16:29Z

      }

-      if (uniform(rng) < val / max_val) {
+      if (uniform(rng()) < val / max_val) {


warning: no header providing "MR::DWI::Tractography::rng" is directly included [misc-include-cleaner]

cpp/core/dwi/tractography/algorithms/iFOD2.h:25:

- #include "dwi/tractography/tracking/method.h" + #include "dwi/tractography/rng.h" + #include "dwi/tractography/tracking/method.h"

github-actions · 2026-06-04T01:16:29Z

  }

-  float get_metric(const Eigen::Vector3f &, const Eigen::Vector3f &) override { return uniform(rng); }
+  float get_metric(const Eigen::Vector3f &, const Eigen::Vector3f &) override { return uniform(rng()); }


warning: all parameters should be named in a function [readability-named-parameter]

Suggested change

float get_metric(const Eigen::Vector3f &, const Eigen::Vector3f &) override { return uniform(rng()); }

float get_metric(const Eigen::Vector3f & /*position*/, const Eigen::Vector3f & /*direction*/) override { return uniform(rng()); }

github-actions · 2026-06-04T01:16:30Z

  }

-  float get_metric(const Eigen::Vector3f &, const Eigen::Vector3f &) override { return uniform(rng); }
+  float get_metric(const Eigen::Vector3f &, const Eigen::Vector3f &) override { return uniform(rng()); }


warning: no header providing "MR::DWI::Tractography::rng" is directly included [misc-include-cleaner]

cpp/core/dwi/tractography/algorithms/nulldist.h:22:

- #include "dwi/tractography/tracking/method.h" + #include "dwi/tractography/rng.h" + #include "dwi/tractography/tracking/method.h"

github-actions · 2026-06-04T01:16:30Z

  }

-  float get_metric(const Eigen::Vector3f &, const Eigen::Vector3f &) override { return uniform(rng); }
+  float get_metric(const Eigen::Vector3f &, const Eigen::Vector3f &) override { return uniform(rng()); }


warning: all parameters should be named in a function [readability-named-parameter]

Suggested change

float get_metric(const Eigen::Vector3f &, const Eigen::Vector3f &) override { return uniform(rng()); }

float get_metric(const Eigen::Vector3f & /*position*/, const Eigen::Vector3f & /*direction*/) override { return uniform(rng()); }

github-actions · 2026-06-04T01:16:30Z

  } while (seed.value() < selector);
-  p = {seed.index(0) + uniform(rng) - 0.5f, seed.index(1) + uniform(rng) - 0.5f, seed.index(2) + uniform(rng) - 0.5f};
+  p = {seed.index(0) + uniform(rng()) - 0.5f,
+       seed.index(1) + uniform(rng()) - 0.5f,


warning: floating point literal has suffix 'f', which is not uppercase [readability-uppercase-literal-suffix]

Suggested change

seed.index(1) + uniform(rng()) - 0.5f,

seed.index(1) + uniform(rng()) - 0.5F,

github-actions · 2026-06-04T01:16:31Z

  } while (seed.value() < selector);
-  p = {seed.index(0) + uniform(rng) - 0.5f, seed.index(1) + uniform(rng) - 0.5f, seed.index(2) + uniform(rng) - 0.5f};
+  p = {seed.index(0) + uniform(rng()) - 0.5f,
+       seed.index(1) + uniform(rng()) - 0.5f,


warning: narrowing conversion from 'ssize_t' (aka 'long') to 'result_type' (aka 'float') [bugprone-narrowing-conversions]

seed.index(1) + uniform(rng()) - 0.5f, ^

github-actions · 2026-06-04T01:16:31Z

-  p = {seed.index(0) + uniform(rng) - 0.5f, seed.index(1) + uniform(rng) - 0.5f, seed.index(2) + uniform(rng) - 0.5f};
+  p = {seed.index(0) + uniform(rng()) - 0.5f,
+       seed.index(1) + uniform(rng()) - 0.5f,
+       seed.index(2) + uniform(rng()) - 0.5f};


warning: floating point literal has suffix 'f', which is not uppercase [readability-uppercase-literal-suffix]

Suggested change

seed.index(2) + uniform(rng()) - 0.5f};

seed.index(2) + uniform(rng()) - 0.5F};

github-actions · 2026-06-04T01:16:31Z

-  p = {seed.index(0) + uniform(rng) - 0.5f, seed.index(1) + uniform(rng) - 0.5f, seed.index(2) + uniform(rng) - 0.5f};
+  p = {seed.index(0) + uniform(rng()) - 0.5f,
+       seed.index(1) + uniform(rng()) - 0.5f,
+       seed.index(2) + uniform(rng()) - 0.5f};


warning: narrowing conversion from 'ssize_t' (aka 'long') to 'result_type' (aka 'float') [bugprone-narrowing-conversions]

seed.index(2) + uniform(rng()) - 0.5f}; ^

github-actions · 2026-06-04T01:16:31Z

      const Eigen::Vector3i &v(fixel.get_voxel());
      const Eigen::Vector3f vp(
-          v[0] + uniform_float(rng) - 0.5, v[1] + uniform_float(rng) - 0.5, v[2] + uniform_float(rng) - 0.5);
+          v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5);


warning: narrowing conversion from 'double' to 'Scalar' (aka 'float') [bugprone-narrowing-conversions]

v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5); ^

Required for new test mrinfo_json_keyval

github-actions

clang-tidy made some suggestions

github-actions · 2026-06-04T01:52:54Z

      const Eigen::Vector3i &v(fixel.get_voxel());
      const Eigen::Vector3f vp(
-          v[0] + uniform_float(rng) - 0.5, v[1] + uniform_float(rng) - 0.5, v[2] + uniform_float(rng) - 0.5);
+          v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5);


warning: narrowing conversion from 'double' to 'Scalar' (aka 'float') [bugprone-narrowing-conversions]

v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5); ^

github-actions · 2026-06-04T01:52:54Z

      const Eigen::Vector3i &v(fixel.get_voxel());
      const Eigen::Vector3f vp(
-          v[0] + uniform_float(rng) - 0.5, v[1] + uniform_float(rng) - 0.5, v[2] + uniform_float(rng) - 0.5);
+          v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5);


warning: narrowing conversion from 'double' to 'Scalar' (aka 'float') [bugprone-narrowing-conversions]

v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5); ^

github-actions · 2026-06-04T01:52:54Z

      const Eigen::Vector3i &v(fixel.get_voxel());
      const Eigen::Vector3f vp(
-          v[0] + uniform_float(rng) - 0.5, v[1] + uniform_float(rng) - 0.5, v[2] + uniform_float(rng) - 0.5);
+          v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5);


warning: narrowing conversion from 'int' to 'result_type' (aka 'float') [bugprone-narrowing-conversions]

v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5); ^

github-actions · 2026-06-04T01:52:55Z

      const Eigen::Vector3i &v(fixel.get_voxel());
      const Eigen::Vector3f vp(
-          v[0] + uniform_float(rng) - 0.5, v[1] + uniform_float(rng) - 0.5, v[2] + uniform_float(rng) - 0.5);
+          v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5);


warning: narrowing conversion from 'int' to 'result_type' (aka 'float') [bugprone-narrowing-conversions]

v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5); ^

github-actions · 2026-06-04T01:52:55Z

      const Eigen::Vector3i &v(fixel.get_voxel());
      const Eigen::Vector3f vp(
-          v[0] + uniform_float(rng) - 0.5, v[1] + uniform_float(rng) - 0.5, v[2] + uniform_float(rng) - 0.5);
+          v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5);


warning: narrowing conversion from 'int' to 'result_type' (aka 'float') [bugprone-narrowing-conversions]

v[0] + uniform_float(rng()) - 0.5, v[1] + uniform_float(rng()) - 0.5, v[2] + uniform_float(rng()) - 0.5); ^

github-actions · 2026-06-04T01:52:55Z


 Eigen::Vector3f MethodBase::random_direction(const float max_angle, const float sin_max_angle) {
-  float phi = 2.0 * Math::pi * uniform(rng);
+  float phi = 2.0 * Math::pi * uniform(rng());


warning: narrowing conversion from 'double' to 'float' [bugprone-narrowing-conversions]

float phi = 2.0 * Math::pi * uniform(rng()); ^

github-actions · 2026-06-04T01:52:55Z


 Eigen::Vector3f MethodBase::random_direction(const float max_angle, const float sin_max_angle) {
-  float phi = 2.0 * Math::pi * uniform(rng);
+  float phi = 2.0 * Math::pi * uniform(rng());


warning: no header providing "MR::Math::pi" is directly included [misc-include-cleaner]

cpp/core/dwi/tractography/tracking/method.cpp:17:

+ #include "math/math.h"

github-actions · 2026-06-04T01:52:55Z


 Eigen::Vector3f MethodBase::random_direction(const float max_angle, const float sin_max_angle) {
-  float phi = 2.0 * Math::pi * uniform(rng);
+  float phi = 2.0 * Math::pi * uniform(rng());


warning: variable 'phi' of type 'float' can be declared 'const' [misc-const-correctness]

Suggested change

float phi = 2.0 * Math::pi * uniform(rng());

float const phi = 2.0 * Math::pi * uniform(rng());

github-actions · 2026-06-04T01:52:55Z

-    theta = max_angle * uniform(rng);
-  } while (sin_max_angle * uniform(rng) > sin(theta));
+    theta = max_angle * uniform(rng());
+  } while (sin_max_angle * uniform(rng()) > sin(theta));


warning: call to 'sin' promotes float to double [performance-type-promotion-in-math-fn]

cpp/core/dwi/tractography/tracking/method.cpp:17:

+ + #include <cmath>

Suggested change

} while (sin_max_angle * uniform(rng()) > sin(theta));

} while (sin_max_angle * uniform(rng()) > std::sin(theta));

github-actions · 2026-06-04T01:52:55Z

-    theta = max_angle * uniform(rng);
-  } while (sin_max_angle * uniform(rng) > sin(theta));
+    theta = max_angle * uniform(rng());
+  } while (sin_max_angle * uniform(rng()) > sin(theta));


warning: no header providing "sin" is directly included [misc-include-cleaner]

cpp/core/dwi/tractography/tracking/method.cpp:17:

+ #include <cmath>

Lestropie added 3 commits June 4, 2026 09:45

Temporarily disable GPU in Windows CI build

256f707

Merge remote-tracking branch 'origin/ci_disable_gpu_windows' into res…

4987e73

…tore_windows_ci

Lestropie self-assigned this Jun 4, 2026

Lestropie added build Windows CI/tests meta Meta-issue grouping multiple issues / PRs labels Jun 4, 2026

Lestropie changed the title ~~Restore windows ci~~ Restore windows CI Jun 4, 2026

github-actions Bot reviewed Jun 4, 2026

View reviewed changes

Install jq in Windows CI Action

89b405f

Required for new test mrinfo_json_keyval

github-actions Bot reviewed Jun 4, 2026

View reviewed changes

Lestropie merged commit 3d096ac into dev Jun 4, 2026
11 of 12 checks passed

Lestropie deleted the restore_windows_ci branch June 4, 2026 02:18

	float get_metric(const Eigen::Vector3f &, const Eigen::Vector3f &) override { return uniform(rng()); }
	float get_metric(const Eigen::Vector3f & /position/, const Eigen::Vector3f & /direction/) override { return uniform(rng()); }

	seed.index(1) + uniform(rng()) - 0.5f,
	seed.index(1) + uniform(rng()) - 0.5F,

	seed.index(2) + uniform(rng()) - 0.5f};
	seed.index(2) + uniform(rng()) - 0.5F};

	float phi = 2.0 * Math::pi * uniform(rng());
	float const phi = 2.0 * Math::pi * uniform(rng());

	} while (sin_max_angle * uniform(rng()) > sin(theta));
	} while (sin_max_angle * uniform(rng()) > std::sin(theta));

Conversation

Lestropie commented Jun 4, 2026

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant