Skip to content

Update sycl_complex_marray branch #1

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
Merged
AidanBeltonS merged 7 commits into from
Oct 26, 2022
Merged

Update sycl_complex_marray branch #1

AidanBeltonS merged 7 commits into from
Oct 26, 2022

Conversation

@jle-quel
Copy link

@jle-quel jle-quel commented Oct 21, 2022

This PR is here to solve the "conflicts that must be resolved" in order to continue the review process of the following PR:

The changes made are:

  • Pull upstream
  • Fix conflicts
  • Update marray tests to use Catch2
  • Increase tol_multiplier for the marray tests where the check almost_equal is too precise.

AidanBeltonS and others added 7 commits August 22, 2022 11:51
@AidanBeltonS
clang format hello world (argonne-lcf#14)
fb929ab
@AidanBeltonS @TApplencourt
Update testing to use Catch2 and CMake (argonne-lcf#16)
33c7071 
* Add catch2

* Update readme

* Set Catch2 to v2.x branch

* Undo Catch2 branch change

* Update from feedback

* Update README.md

Co-authored-by: Thomas Applencourt <TApplencourt@users.noreply.github.com>

* Remove cmake comments

Co-authored-by: Thomas Applencourt <TApplencourt@users.noreply.github.com>
@jle-quel @TApplencourt
Update dpcpp macro from __INTEL_LLVM_COMPILER to __SYCL_COMPILER_VERS…
ac0b911 
…ION (argonne-lcf#18)

* update dpcpp macro from __INTEL_LLVM_COMPILER to __SYCL_COMPILER_VERSION

* Apply PR's comment

Co-authored-by: Thomas Applencourt <TApplencourt@users.noreply.github.com>

Co-authored-by: Jefferson Le Quellec <jefferson.lequellec@codeplay.com>
Co-authored-by: Thomas Applencourt <TApplencourt@users.noreply.github.com>
@jle-quel
pull upstream; fix conflicts; update marray testing to use Catch2
d6fbd03
@jle-quel
update marray testing to use Catch2
7f38c63
@jle-quel
increase tol_multiplier for acos(h) and asin(h) tests
8199298
@jle-quel
increase tol_multiplier for acos(h) and asin(h) tests (fix previous c…
43c71fb 
…ommit)
@AidanBeltonS AidanBeltonS merged commit 37f19e0 into AidanBeltonS:sycl_complex_marray Oct 26, 2022
@jle-quel jle-quel deleted the jle-quel/fix-conflicts branch November 7, 2022 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jle-quel @AidanBeltonS