Skip to content

Reverse win gtest condition - #450

Merged
stanleytsang-amd merged 1 commit into
ROCm:developfrom
umfranzw:reverse_win_gtest_condition
Jul 4, 2025
Merged

stanleytsang-amd merged 1 commit into
ROCm:developfrom
umfranzw:reverse_win_gtest_condition

Conversation

@umfranzw

Copy link
Copy Markdown
Contributor

Reverse UseGTestAssert condition on Windows

Recently, we added a check to see if GTest's ASSERT_EQ assertion
should be used within the assert_eq function. The code in the if/else
blocks that act on the results of this check was inverted (the "else"
code block should be the "if" block, and vice-versa).
This change fixes the issue by swapping the code blocks.

This change should be merged after #449.

Recently, we added a check to see if GTest's ASSERT_EQ assertion
should be used within the assert_eq function. The code in the if/else
blocks that act on the results of this check was inverted (the "else"
code block should be the "if" block, and vice-versa).

This change fixes the issue by swapping the code blocks.
@umfranzw
umfranzw force-pushed the reverse_win_gtest_condition branch from d17196b to 9f25c6f Compare July 1, 2025 00:48
@umfranzw

umfranzw commented Jul 2, 2025

Copy link
Copy Markdown
Contributor Author

/azp run rocPRIM

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@stanleytsang-amd

Copy link
Copy Markdown
Contributor

We are aware that there is a failing test reported by CI in this PR. It is the device_merge_inplace test. The test failure does seem potentially legitimate, however, the test failure is wholly unrelated to the contents of this PR. As such, it is the opinion of our team that this PR is safe to merge. It is also required to unblock the outstanding unit test coverage PRs for rocPRIM, rocThrust, hipCUB, rocRAND. We will continue to investigate the merge_inplace test failures on our own MI300 and MI200 machines.

@stanleytsang-amd
stanleytsang-amd merged commit e98e50f into ROCm:develop Jul 4, 2025
assistant-librarian Bot pushed a commit to ROCm/rocPRIM that referenced this pull request Jul 4, 2025
Reverse win gtest condition

Reverse UseGTestAssert condition on Windows

Recently, we added a check to see if GTest's ASSERT_EQ assertion
should be used within the assert_eq function. The code in the if/else
blocks that act on the results of this check was inverted (the "else"
code block should be the "if" block, and vice-versa).
This change fixes the issue by swapping the code blocks.

This change should be merged after #449.
umfranzw added a commit to umfranzw/rocm-libraries that referenced this pull request Jul 4, 2025
Reverse UseGTestAssert condition on Windows
    
Recently, we added a check to see if GTest's ASSERT_EQ assertion
should be used within the assert_eq function. The code in the if/else
blocks that act on the results of this check was inverted (the "else"
code block should be the "if" block, and vice-versa).
This change fixes the issue by swapping the code blocks.

This change should be merged after ROCm#449.
stanleytsang-amd pushed a commit that referenced this pull request Jul 8, 2025
Reverse UseGTestAssert condition on Windows
    
Recently, we added a check to see if GTest's ASSERT_EQ assertion should
be used within the assert_eq function. The code in the if/else blocks
that act on the results of this check was inverted (the "else" code
block should be the "if" block, and vice-versa). This change fixes the
issue by swapping the code blocks.

This change should be merged after #449.
JeniferC99 pushed a commit that referenced this pull request Jul 17, 2025
Reverse UseGTestAssert condition on Windows
    
Recently, we added a check to see if GTest's ASSERT_EQ assertion
should be used within the assert_eq function. The code in the if/else
blocks that act on the results of this check was inverted (the "else"
code block should be the "if" block, and vice-versa).
This change fixes the issue by swapping the code blocks.

This change should be merged after #449.
ammallya pushed a commit that referenced this pull request Jul 22, 2025
Co-authored-by: jsandham <james.sandham@amd.com>

[ROCm/hipSPARSE commit: 2c0881f]
stanleytsang-amd pushed a commit that referenced this pull request Oct 24, 2025
Reverse UseGTestAssert condition on Windows
    
Recently, we added a check to see if GTest's ASSERT_EQ assertion
should be used within the assert_eq function. The code in the if/else
blocks that act on the results of this check was inverted (the "else"
code block should be the "if" block, and vice-versa).
This change fixes the issue by swapping the code blocks.

This change should be merged after #449.
ammallya pushed a commit that referenced this pull request Oct 27, 2025
…2.2.2

Bump urllib3 from 2.2.1 to 2.2.2 in /docs/sphinx
ammallya pushed a commit that referenced this pull request Oct 28, 2025
…2.2.2

Bump urllib3 from 2.2.1 to 2.2.2 in /docs/sphinx

[ROCm/rocwmma commit: 0c882ae]
mpanoop pushed a commit to mpanoop/rocm-libraries that referenced this pull request Oct 5, 2026
* Remove Thrust comments referencing website (ROCm#451)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Specify minimum version for Google benchmark (ROCm#450)

* Remove Thrust comments referencing website (ROCm#447)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Bump rocm-docs-core from 1.6.2 to 1.7.1 in /docs/sphinx (ROCm#448)

Bumps [rocm-docs-core](https://github.com/ROCm/rocm-docs-core) from 1.6.2 to 1.7.1.
- [Release notes](https://github.com/ROCm/rocm-docs-core/releases)
- [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](ROCm/rocm-docs-core@v1.6.2...v1.7.1)

---
updated-dependencies:
- dependency-name: rocm-docs-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Specify minimum version for Google benchmark

Pass a minimum version to find_package to prevent it from using
outdated versions of Google benchmark that may be present on
the system.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Temporarily disable scan tests, re-enable tests on gfx11xx (ROCm#449)

* Remove Thrust comments referencing website (ROCm#447)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Temporarily disable scan tests, re-enable tests on gfx11xx

Remove code that excludes gfx11xx tests on Jenkins, since they work there now.
Add a temporary exclusion for test_thrust_scan, which needs a compiler fix.

* Remove website URL from comments (ROCm#456)

Referencing or using code from some websites is prohibited in this repository.
This change removes an informational reference in the comments.

* Add checks around some platform-specific benchmark code (ROCm#455)

There were two spots in the new benchmark code that were causing compile-time
issues on some Windows systems. This change adds a check to make sure we have
128-bit integer support before using int128_t in generation_utils.hpp.
It also avoids calling clock_gettime on Windows, since it seems
to be causing build issues there. Instead, I've restored the old Windows timing
code from PR ROCm#431, which uses QueryPerformanceFrequency/Counter instead.

* Add gfx1151 build target (ROCm#457) (ROCm#459)

* Add gfx1151 target

* Revert "Add gfx1151 target"

This reverts commit 5889238d5e754f79fbb9d353b0bf4def528cfc78.

* Add gfx1151 target while preserving address sanitizer targets

---------

Co-authored-by: Stanley Tsang <stanley.tsang@amd.com>

* Remove website reference (ROCm#460)

Removed the link to more information from the CRC algorithm comments.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: amd-garydeng <garydeng@amd.com>
Co-authored-by: Stanley Tsang <stanley.tsang@amd.com>

[ROCm/rocThrust commit: 4aae471]
mpanoop pushed a commit to mpanoop/rocm-libraries that referenced this pull request Oct 5, 2026
* Remove Thrust comments referencing website (ROCm#451)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Specify minimum version for Google benchmark (ROCm#450)

* Remove Thrust comments referencing website (ROCm#447)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Bump rocm-docs-core from 1.6.2 to 1.7.1 in /docs/sphinx (ROCm#448)

Bumps [rocm-docs-core](https://github.com/ROCm/rocm-docs-core) from 1.6.2 to 1.7.1.
- [Release notes](https://github.com/ROCm/rocm-docs-core/releases)
- [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](ROCm/rocm-docs-core@v1.6.2...v1.7.1)

---
updated-dependencies:
- dependency-name: rocm-docs-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Specify minimum version for Google benchmark

Pass a minimum version to find_package to prevent it from using
outdated versions of Google benchmark that may be present on
the system.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Temporarily disable scan tests, re-enable tests on gfx11xx (ROCm#449)

* Remove Thrust comments referencing website (ROCm#447)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Temporarily disable scan tests, re-enable tests on gfx11xx

Remove code that excludes gfx11xx tests on Jenkins, since they work there now.
Add a temporary exclusion for test_thrust_scan, which needs a compiler fix.

* Remove website URL from comments (ROCm#456)

Referencing or using code from some websites is prohibited in this repository.
This change removes an informational reference in the comments.

* Add checks around some platform-specific benchmark code (ROCm#455)

There were two spots in the new benchmark code that were causing compile-time
issues on some Windows systems. This change adds a check to make sure we have
128-bit integer support before using int128_t in generation_utils.hpp.
It also avoids calling clock_gettime on Windows, since it seems
to be causing build issues there. Instead, I've restored the old Windows timing
code from PR ROCm#431, which uses QueryPerformanceFrequency/Counter instead.

* Add gfx1151 build target (ROCm#457) (ROCm#459)

* Add gfx1151 target

* Revert "Add gfx1151 target"

This reverts commit 5889238d5e754f79fbb9d353b0bf4def528cfc78.

* Add gfx1151 target while preserving address sanitizer targets

---------

Co-authored-by: Stanley Tsang <stanley.tsang@amd.com>

* Remove website reference (ROCm#460)

Removed the link to more information from the CRC algorithm comments.

* updated the changelog for 6.3 (ROCm#480)

* updated the changelog for 6.3

* removed '(unreleased)' for 6.2

* added support for gfx12 and gfx1151 in default gpu list

* updated changelog

* fixed some minor grammar in changelog

* Remove gfx940,gfx941 targets (ROCm#484)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Wayne Franz <wayfranz@amd.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: amd-garydeng <garydeng@amd.com>
Co-authored-by: spolifroni-amd <Sandra.Polifroni@amd.com>
Co-authored-by: NguyenNhuDi <dinguyennhu@gmail.com>
Co-authored-by: Val Movsik <160653499+vamovsik@users.noreply.github.com>

[ROCm/rocThrust commit: d935e55]
mpanoop pushed a commit to mpanoop/rocm-libraries that referenced this pull request Oct 5, 2026
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.4...3.1.5)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

[ROCm/hipCUB commit: 1f363f1]
mpanoop pushed a commit to mpanoop/rocm-libraries that referenced this pull request Oct 5, 2026
Reverse UseGTestAssert condition on Windows
    
Recently, we added a check to see if GTest's ASSERT_EQ assertion
should be used within the assert_eq function. The code in the if/else
blocks that act on the results of this check was inverted (the "else"
code block should be the "if" block, and vice-versa).
This change fixes the issue by swapping the code blocks.

This change should be merged after ROCm#449.
mpanoop pushed a commit to mpanoop/rocm-libraries that referenced this pull request Oct 5, 2026
* Remove Thrust comments referencing website (ROCm#451)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Specify minimum version for Google benchmark (ROCm#450)

* Remove Thrust comments referencing website (ROCm#447)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Bump rocm-docs-core from 1.6.2 to 1.7.1 in /docs/sphinx (ROCm#448)

Bumps [rocm-docs-core](https://github.com/ROCm/rocm-docs-core) from 1.6.2 to 1.7.1.
- [Release notes](https://github.com/ROCm/rocm-docs-core/releases)
- [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](ROCm/rocm-docs-core@v1.6.2...v1.7.1)

---
updated-dependencies:
- dependency-name: rocm-docs-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Specify minimum version for Google benchmark

Pass a minimum version to find_package to prevent it from using
outdated versions of Google benchmark that may be present on
the system.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Temporarily disable scan tests, re-enable tests on gfx11xx (ROCm#449)

* Remove Thrust comments referencing website (ROCm#447)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Temporarily disable scan tests, re-enable tests on gfx11xx

Remove code that excludes gfx11xx tests on Jenkins, since they work there now.
Add a temporary exclusion for test_thrust_scan, which needs a compiler fix.

* Remove website URL from comments (ROCm#456)

Referencing or using code from some websites is prohibited in this repository.
This change removes an informational reference in the comments.

* Add checks around some platform-specific benchmark code (ROCm#455)

There were two spots in the new benchmark code that were causing compile-time
issues on some Windows systems. This change adds a check to make sure we have
128-bit integer support before using int128_t in generation_utils.hpp.
It also avoids calling clock_gettime on Windows, since it seems
to be causing build issues there. Instead, I've restored the old Windows timing
code from PR ROCm#431, which uses QueryPerformanceFrequency/Counter instead.

* Add gfx1151 build target (ROCm#457) (ROCm#459)

* Add gfx1151 target

* Revert "Add gfx1151 target"

This reverts commit 5889238d5e754f79fbb9d353b0bf4def528cfc78.

* Add gfx1151 target while preserving address sanitizer targets

---------

Co-authored-by: Stanley Tsang <stanley.tsang@amd.com>

* Remove website reference (ROCm#460)

Removed the link to more information from the CRC algorithm comments.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: amd-garydeng <garydeng@amd.com>
Co-authored-by: Stanley Tsang <stanley.tsang@amd.com>

[ROCm/rocThrust commit: 4aae471]
mpanoop pushed a commit to mpanoop/rocm-libraries that referenced this pull request Oct 5, 2026
* Remove Thrust comments referencing website (ROCm#451)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Specify minimum version for Google benchmark (ROCm#450)

* Remove Thrust comments referencing website (ROCm#447)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Bump rocm-docs-core from 1.6.2 to 1.7.1 in /docs/sphinx (ROCm#448)

Bumps [rocm-docs-core](https://github.com/ROCm/rocm-docs-core) from 1.6.2 to 1.7.1.
- [Release notes](https://github.com/ROCm/rocm-docs-core/releases)
- [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](ROCm/rocm-docs-core@v1.6.2...v1.7.1)

---
updated-dependencies:
- dependency-name: rocm-docs-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Specify minimum version for Google benchmark

Pass a minimum version to find_package to prevent it from using
outdated versions of Google benchmark that may be present on
the system.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Temporarily disable scan tests, re-enable tests on gfx11xx (ROCm#449)

* Remove Thrust comments referencing website (ROCm#447)

Referencing or using code from some websites is prohibited in rocThrust.
Some comments with these kinds of references were recently added by
Thrust, and then when we updated the API, were brought into rocThrust.
This change removes the references in the comments.

* Temporarily disable scan tests, re-enable tests on gfx11xx

Remove code that excludes gfx11xx tests on Jenkins, since they work there now.
Add a temporary exclusion for test_thrust_scan, which needs a compiler fix.

* Remove website URL from comments (ROCm#456)

Referencing or using code from some websites is prohibited in this repository.
This change removes an informational reference in the comments.

* Add checks around some platform-specific benchmark code (ROCm#455)

There were two spots in the new benchmark code that were causing compile-time
issues on some Windows systems. This change adds a check to make sure we have
128-bit integer support before using int128_t in generation_utils.hpp.
It also avoids calling clock_gettime on Windows, since it seems
to be causing build issues there. Instead, I've restored the old Windows timing
code from PR ROCm#431, which uses QueryPerformanceFrequency/Counter instead.

* Add gfx1151 build target (ROCm#457) (ROCm#459)

* Add gfx1151 target

* Revert "Add gfx1151 target"

This reverts commit 5889238d5e754f79fbb9d353b0bf4def528cfc78.

* Add gfx1151 target while preserving address sanitizer targets

---------

Co-authored-by: Stanley Tsang <stanley.tsang@amd.com>

* Remove website reference (ROCm#460)

Removed the link to more information from the CRC algorithm comments.

* updated the changelog for 6.3 (ROCm#480)

* updated the changelog for 6.3

* removed '(unreleased)' for 6.2

* added support for gfx12 and gfx1151 in default gpu list

* updated changelog

* fixed some minor grammar in changelog

* Remove gfx940,gfx941 targets (ROCm#484)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Wayne Franz <wayfranz@amd.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: amd-garydeng <garydeng@amd.com>
Co-authored-by: spolifroni-amd <Sandra.Polifroni@amd.com>
Co-authored-by: NguyenNhuDi <dinguyennhu@gmail.com>
Co-authored-by: Val Movsik <160653499+vamovsik@users.noreply.github.com>

[ROCm/rocThrust commit: d935e55]
mpanoop pushed a commit to mpanoop/rocm-libraries that referenced this pull request Oct 5, 2026
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.4...3.1.5)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

[ROCm/hipCUB commit: 1f363f1]
mpanoop pushed a commit to mpanoop/rocm-libraries that referenced this pull request Oct 5, 2026
Reverse UseGTestAssert condition on Windows
    
Recently, we added a check to see if GTest's ASSERT_EQ assertion
should be used within the assert_eq function. The code in the if/else
blocks that act on the results of this check was inverted (the "else"
code block should be the "if" block, and vice-versa).
This change fixes the issue by swapping the code blocks.

This change should be merged after ROCm#449.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants