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.

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

this is a PR for 4005 vs2019build, which fixes a few things on Windows. #981

Merged
merged 1 commit into from
May 19, 2021

Conversation

jrobcary
Copy link
Contributor

@jrobcary jrobcary commented May 18, 2021

This fixes #957

switching on KOKKOS_COMPILER_MSVC

src/common/KokkosKernels_IOUtils.hpp:

Change struct stat to struct _stat on Windows.

src/common/KokkosKernels_BitUtils.hpp:

Define pop_count and least_set_bit on for _MSC_VER.

These need intrin.h included.

Will remove old PR.

src/common/KokkosKernels_IOUtils.hpp:

Change struct stat to struct _stat on Windows.

src/common/KokkosKernels_BitUtils.hpp:

Define pop_count and least_set_bit on for _MSC_VER.

These need intrin.h included.
@kokkos-devops-admin
Copy link

Status Flag 'Pre-Test Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
WARNING: NO REVIEWERS HAVE BEEN REQUESTED FOR THIS PULL REQUEST!

Copy link
Contributor

@ndellingwood ndellingwood left a comment

Choose a reason for hiding this comment

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

I don't have access to test the changes with Windows, but non-Windows this lgtm since all changes are guarded by windows/msvc macros and should have no impact on non-Windows builds. @lucbv if you're good with this, I will merge after testing and cherry-pick over to the release-candidate-3.4.1 branch

@kokkos-devops-admin
Copy link

Status Flag 'Pre-Test Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ ndellingwood ]!

@kokkos-devops-admin
Copy link

Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: KokkosKernels_PullRequest_GCC720

  • Build Num: 240
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC720

  • Build Num: 233
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL18

  • Build Num: 219
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720_Light

  • Build Num: 274
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720_Light_LayoutRight

  • Build Num: 52
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA10

  • Build Num: 238
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA10_LayoutRight

  • Build Num: 51
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA9

  • Build Num: 235
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC720_GCC740

  • Build Num: 233
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Using Repos:

Repo: KOKKOSKERNELS (Tech-XCorp/kokkos-kernels)
  • Branch: 4005-winllvmbuild
  • SHA: 57b1a00
  • Mode: TEST_REPO

Pull Request Author: jrobcary

@kokkos-devops-admin
Copy link

Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED

Pull Request Auto Testing has PASSED (click to expand)

Build Information

Test Name: KokkosKernels_PullRequest_GCC720

  • Build Num: 240
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC720

  • Build Num: 233
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL18

  • Build Num: 219
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720_Light

  • Build Num: 274
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720_Light_LayoutRight

  • Build Num: 52
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA10

  • Build Num: 238
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA10_LayoutRight

  • Build Num: 51
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA9

  • Build Num: 235
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC720_GCC740

  • Build Num: 233
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 4005-winllvmbuild
KOKKOSKERNELS_SOURCE_REPO https://github.com/Tech-XCorp/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 57b1a00
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 23e060f
PULLREQUESTNUM 981
TEST_REPO_ALIAS KOKKOSKERNELS

@kokkos-devops-admin
Copy link

Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ ndellingwood ]!

@kokkos-devops-admin
Copy link

Status Flag 'Pull Request AutoTester' - Pull Request MUST BE MERGED MANUALLY BY Project Team - This Repo does not support Automerge

@lucbv
Copy link
Contributor

lucbv commented May 19, 2021

@ndellingwood yes this looks fine to me and the auto-tester is passing so we should be good here

@ndellingwood ndellingwood merged commit 9b5695e into kokkos:develop May 19, 2021
ndellingwood added a commit to ndellingwood/kokkos-kernels that referenced this pull request May 19, 2021
this is a PR for 4005 vs2019build, which fixes a few things on Windows.

(cherry picked from commit 9b5695e)
ndellingwood added a commit that referenced this pull request May 19, 2021
Merge pull request #981 from Tech-XCorp/4005-winllvmbuild
@ndellingwood
Copy link
Contributor

Thanks @jrobcary and @lucbv ! I cherry picked this over to release-candidate-3.4.1 with #984

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.

4 participants