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

Specify OMR_CUDA_HOME when CUDA is enabled #374

Merged
merged 1 commit into from Feb 11, 2020

Conversation

rwy7
Copy link
Contributor

@rwy7 rwy7 commented Feb 10, 2020

The search mechanism for CUDA in OMR is changing. Defining OMR_CUDA_HOME will allow OMR to continue to locate CUDA with the new mechanism.

Signed-off-by: Robert Young rwy0717@gmail.com

The search mechanism for CUDA in OMR is changing. Defining OMR_CUDA_HOME will allow OMR to continue to locate CUDA with the new mechanism.

Signed-off-by: Robert Young <rwy0717@gmail.com>
@rwy7 rwy7 marked this pull request as ready for review February 10, 2020 21:58
@@ -493,7 +493,7 @@ else
endif

ifeq (true,$(OPENJ9_ENABLE_CUDA))
CMAKE_ARGS += -DJ9VM_OPT_CUDA=ON
CMAKE_ARGS += -DJ9VM_OPT_CUDA=ON -DOMR_CUDA_HOME="$(CUDA_HOME)"
CMAKE_CUDA_ENV := CUDA_BIN_PATH="$(CUDA_HOME)"
Copy link
Member

@keithc-ca keithc-ca Feb 11, 2020

Choose a reason for hiding this comment

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

We don't won't need CMAKE_CUDA_ENV any more: can you remove its definitions and uses?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was thinking, In order to keep the repository working, that could come in a later PR. So we'd accept this PR and it's counterpart in jdk11, then accept the OMR patch, then I'd open two new PRs cleaning up OpenJ9.gmk. That way, there's no window where cmake builds are broken. Does that sound OK?

@rwy7
Copy link
Contributor Author

rwy7 commented Feb 11, 2020

The copyright and line endings checks are broken, they both failed to check out the PR. the copyright date is already up-to-date, and this PR is coming from an osx machine, so I doubt there are line ending issues.

Maybe someone can rerun the tests, or we can just ignore the failures?

@keithc-ca keithc-ca self-assigned this Feb 11, 2020
@keithc-ca
Copy link
Member

Jenkins copyright check

@keithc-ca
Copy link
Member

Jenkins line endings check

@rwy7
Copy link
Contributor Author

rwy7 commented Feb 11, 2020

Same failure, weird. The tool is trying to check out the wrong commit. Here's some choice output:

The checkout (wrong):

git checkout -f 54dee59d2d40b97e2bd605178f7282ae3057aeac

Setting the status (correct):

Setting status of 64eb96991a68d0cede0f65489932a7f8d81a51df to FAILURE

EDIT: Sorry, my mistake, 54dee is the merge commit, which is valid. The wrong object is 79318c425c6cad144bd3cc564573b402b1bc17d3, I don't know where that's coming from.

@keithc-ca
Copy link
Member

Those are the expected commit SHAs (64eb96991a68d0cede0f65489932a7f8d81a51df is the head of your branch, 54dee59d2d40b97e2bd605178f7282ae3057aeac is refs/pull/merge/374).

@keithc-ca
Copy link
Member

Jenkins copyright check

1 similar comment
@keithc-ca
Copy link
Member

Jenkins copyright check

@keithc-ca
Copy link
Member

Jenkins line endings check

@keithc-ca
Copy link
Member

Jenkins compile xlinuxcm jdk8

@keithc-ca keithc-ca merged commit 544e7f2 into ibmruntimes:openj9 Feb 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants