Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include hipstdpar in rocThrust packages #343

Merged
merged 5 commits into from
Dec 1, 2023
Merged

Include hipstdpar in rocThrust packages #343

merged 5 commits into from
Dec 1, 2023

Conversation

lawruble13
Copy link
Contributor

Include the hipstdpar-lib.hpp file in rocThrust installations, and set up the rocThrust package to be installed when the hipstdpar package is requested.

@lawruble13
Copy link
Contributor Author

Note that this also depends on rocm-cmake PR #162 to correct some behaviour around the PROVIDES field and variables.

@saadrahim
Copy link
Member

Why is hipstdpar in rocThrust? I do not understand the logic.

@lawruble13
Copy link
Contributor Author

Why is hipstdpar in rocThrust? I do not understand the logic.

This was the proposed solution because hipstdpar is a single header, that depends on rocThrust. While it could be its own additional package, it was considered simpler to include the header file in rocThrust and add the correct name to the provides field.

@doctorcolinsmith
Copy link
Collaborator

I think the packaging additon is fine, but a quick addition to the README and CHANGELOG should be included.

lawruble13 and others added 3 commits November 21, 2023 15:54
@lawruble13
Move hipstdpar to match thrust convention
a5de57d
@AlexVlx
Update hipstdpar_lib.hpp
8695a53 
Removed cppreference references and debug message.
@AlexVlx
Update hipstdpar_lib.hpp
6bf2560 
Update license.
AlexVlx
AlexVlx approved these changes Nov 29, 2023
View reviewed changes
Copy link
Contributor

@AlexVlx AlexVlx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks.

@lawruble13 lawruble13 merged commit d7d767c into ROCm:develop Dec 1, 2023
22 of 24 checks passed
stanleytsang-amd added a commit that referenced this pull request Dec 6, 2023
@stanleytsang-amd @Naraenda
@mfep @LisaDelaney @lawruble13 @AlexVlx
Bulk fast-forward merge develop to 6.1 staging branch (#349)
8e04416 
* StreamHPC 2023-10-30 (#338)

* fix: Restore compatibility with latest rocPRIM

rocPRIM changed the API of `lookback_scan_state`, update usage to match.

* fix: doxygen warnings

---------

Co-authored-by: Gergely Meszaros <[email protected]>

* Fixed segfault in HIP binary search (#342)

* Fixed segfault in HIP binary search

By using a different way of host->device and device->host copies.
The copy using the class "reference" cannot have access to the state of
the system. This caused a segfault when the HIP stream selector system
is used, because it tries to access the system (nullptr) for a stream.

The incantation that is the new implementation is borrowed from the cuda
system.

* Updated changelog

* readme and changelog updates (#346)

* Include hipstdpar in rocThrust packages (#343)

* Add hipstdpar header and target

* Add `hipstdpar` to package provides for rocThrust

* Move hipstdpar to match thrust convention

* Update hipstdpar_lib.hpp

Removed cppreference references and debug message.

* Update hipstdpar_lib.hpp

Update license.

---------

Co-authored-by: Alex Voicu <[email protected]>

---------

Co-authored-by: Nara <[email protected]>
Co-authored-by: Gergely Meszaros <[email protected]>
Co-authored-by: Lőrinc Serfőző <[email protected]>
Co-authored-by: Lisa <[email protected]>
Co-authored-by: Lauren Wrubleski <[email protected]>
Co-authored-by: Alex Voicu <[email protected]>
stanleytsang-amd added a commit that referenced this pull request Jan 17, 2024
@stanleytsang-amd @Naraenda
@mfep @LisaDelaney @lawruble13 @AlexVlx @dependabot @samjwu @dgaliffiAMD
6.1 bulk update from develop branch 2024-1-16 (#366)
8d68026 
* StreamHPC 2023-10-30 (#338)

* fix: Restore compatibility with latest rocPRIM

rocPRIM changed the API of `lookback_scan_state`, update usage to match.

* fix: doxygen warnings

---------

Co-authored-by: Gergely Meszaros <[email protected]>

* Fixed segfault in HIP binary search (#342)

* Fixed segfault in HIP binary search

By using a different way of host->device and device->host copies.
The copy using the class "reference" cannot have access to the state of
the system. This caused a segfault when the HIP stream selector system
is used, because it tries to access the system (nullptr) for a stream.

The incantation that is the new implementation is borrowed from the cuda
system.

* Updated changelog

* readme and changelog updates (#346)

* Include hipstdpar in rocThrust packages (#343)

* Add hipstdpar header and target

* Add `hipstdpar` to package provides for rocThrust

* Move hipstdpar to match thrust convention

* Update hipstdpar_lib.hpp

Removed cppreference references and debug message.

* Update hipstdpar_lib.hpp

Update license.

---------

Co-authored-by: Alex Voicu <[email protected]>

* Bump urllib3 from 1.26.17 to 1.26.18 in /docs/.sphinx (#334)

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.17 to 1.26.18.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.17...1.26.18)

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

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

* Bump cryptography from 41.0.4 to 41.0.6 in /docs/.sphinx (#347)

Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.4 to 41.0.6.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@41.0.4...41.0.6)

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

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

* Bump rocm-docs-core from 0.25.0 to 0.30.3 in /docs/.sphinx (#354)

Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.25.0 to 0.30.3.
- [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases)
- [Changelog](https://github.com/RadeonOpenCompute/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](ROCm/rocm-docs-core@v0.25.0...v0.30.3)

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

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

* 6.0 final mergeback to develop (#357)

* Update changelog with correct categorizations (#328)

* Change device_malloc specialization to instantiation (#332)

* Update changelog and version for 6.0 (#340)

* Cherry pick binary search fix for 6.0 (#345)

Co-authored-by: Lőrinc Serfőző <[email protected]>

---------

Co-authored-by: Lőrinc Serfőző <[email protected]>

* Standardize documentation for ReadtheDocs (#360)

* Standardize documentation for ReadtheDocs

* Use custom venv for RTD doxygen 1.9.8

* Add CODEOWNERS file (#361)

* Bump jinja2 from 3.1.2 to 3.1.3 in /docs/sphinx (#362)

Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.2...3.1.3)

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

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

* Bump gitpython from 3.1.37 to 3.1.41 in /docs/sphinx (#363)

Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.37 to 3.1.41.
- [Release notes](https://github.com/gitpython-developers/GitPython/releases)
- [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES)
- [Commits](gitpython-developers/GitPython@3.1.37...3.1.41)

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

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

* Bump rocm-docs-core from 0.30.3 to 0.31.0 in /docs/sphinx (#364)

Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.30.3 to 0.31.0.
- [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases)
- [Changelog](https://github.com/RadeonOpenCompute/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](ROCm/rocm-docs-core@v0.30.3...v0.31.0)

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

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

* Update links in README file

- Update links to ROCm repositories that are now in the ROCm Organization.
- Fixed broken links to the "Supported Hardware" documentation.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Nara <[email protected]>
Co-authored-by: Gergely Meszaros <[email protected]>
Co-authored-by: Lőrinc Serfőző <[email protected]>
Co-authored-by: Lisa <[email protected]>
Co-authored-by: Lauren Wrubleski <[email protected]>
Co-authored-by: Alex Voicu <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sam Wu <[email protected]>
Co-authored-by: David Galiffi <[email protected]>
stanleytsang-amd added a commit that referenced this pull request Feb 6, 2024
@stanleytsang-amd @Naraenda
@mfep @LisaDelaney @lawruble13 @AlexVlx @dependabot @samjwu @dgaliffiAMD
Update 6.1 staging branch with hipstdpar fix and documentation update (…
41defe7 
…#378)

* StreamHPC 2023-10-30 (#338)

* fix: Restore compatibility with latest rocPRIM

rocPRIM changed the API of `lookback_scan_state`, update usage to match.

* fix: doxygen warnings

---------

Co-authored-by: Gergely Meszaros <[email protected]>

* Fixed segfault in HIP binary search (#342)

* Fixed segfault in HIP binary search

By using a different way of host->device and device->host copies.
The copy using the class "reference" cannot have access to the state of
the system. This caused a segfault when the HIP stream selector system
is used, because it tries to access the system (nullptr) for a stream.

The incantation that is the new implementation is borrowed from the cuda
system.

* Updated changelog

* readme and changelog updates (#346)

* Include hipstdpar in rocThrust packages (#343)

* Add hipstdpar header and target

* Add `hipstdpar` to package provides for rocThrust

* Move hipstdpar to match thrust convention

* Update hipstdpar_lib.hpp

Removed cppreference references and debug message.

* Update hipstdpar_lib.hpp

Update license.

---------

Co-authored-by: Alex Voicu <[email protected]>

* Bump urllib3 from 1.26.17 to 1.26.18 in /docs/.sphinx (#334)

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.17 to 1.26.18.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.17...1.26.18)

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

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

* Bump cryptography from 41.0.4 to 41.0.6 in /docs/.sphinx (#347)

Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.4 to 41.0.6.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@41.0.4...41.0.6)

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

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

* Bump rocm-docs-core from 0.25.0 to 0.30.3 in /docs/.sphinx (#354)

Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.25.0 to 0.30.3.
- [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases)
- [Changelog](https://github.com/RadeonOpenCompute/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](ROCm/rocm-docs-core@v0.25.0...v0.30.3)

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

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

* 6.0 final mergeback to develop (#357)

* Update changelog with correct categorizations (#328)

* Change device_malloc specialization to instantiation (#332)

* Update changelog and version for 6.0 (#340)

* Cherry pick binary search fix for 6.0 (#345)

Co-authored-by: Lőrinc Serfőző <[email protected]>

---------

Co-authored-by: Lőrinc Serfőző <[email protected]>

* Standardize documentation for ReadtheDocs (#360)

* Standardize documentation for ReadtheDocs

* Use custom venv for RTD doxygen 1.9.8

* Add CODEOWNERS file (#361)

* Bump jinja2 from 3.1.2 to 3.1.3 in /docs/sphinx (#362)

Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.2...3.1.3)

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

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

* Bump gitpython from 3.1.37 to 3.1.41 in /docs/sphinx (#363)

Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.37 to 3.1.41.
- [Release notes](https://github.com/gitpython-developers/GitPython/releases)
- [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES)
- [Commits](gitpython-developers/GitPython@3.1.37...3.1.41)

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

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

* Bump rocm-docs-core from 0.30.3 to 0.31.0 in /docs/sphinx (#364)

Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.30.3 to 0.31.0.
- [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases)
- [Changelog](https://github.com/RadeonOpenCompute/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](ROCm/rocm-docs-core@v0.30.3...v0.31.0)

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

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

* Update links in README file

- Update links to ROCm repositories that are now in the ROCm Organization.
- Fixed broken links to the "Supported Hardware" documentation.

* Fix misuses of `for_each`'s return value. Relocate header. (#368)

* Bump rocm-docs-core from 0.31.0 to 0.33.0 in /docs/sphinx (#372)

Bumps [rocm-docs-core](https://github.com/RadeonOpenCompute/rocm-docs-core) from 0.31.0 to 0.33.0.
- [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases)
- [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](ROCm/rocm-docs-core@v0.31.0...v0.33.0)

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

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

* Add codeowners for documentation (#370)

* Add codeowners for documentation

* Update CODEOWNERS

---------

Co-authored-by: samjwu <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Nara <[email protected]>
Co-authored-by: Gergely Meszaros <[email protected]>
Co-authored-by: Lőrinc Serfőző <[email protected]>
Co-authored-by: Lisa <[email protected]>
Co-authored-by: Lauren Wrubleski <[email protected]>
Co-authored-by: Alex Voicu <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sam Wu <[email protected]>
Co-authored-by: David Galiffi <[email protected]>
Co-authored-by: samjwu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexVlx AlexVlx AlexVlx approved these changes

@searlmc1 searlmc1 Awaiting requested review from searlmc1

@doctorcolinsmith doctorcolinsmith Awaiting requested review from doctorcolinsmith

@stanleytsang-amd stanleytsang-amd Awaiting requested review from stanleytsang-amd stanleytsang-amd is a code owner

@saadrahim saadrahim Awaiting requested review from saadrahim

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lawruble13 @saadrahim @doctorcolinsmith @AlexVlx