Skip to content

Conversation

peterbell10
Copy link
Collaborator

@peterbell10 peterbell10 commented Sep 22, 2021

[ghstack-poisoned]
@pytorch-probot
Copy link

pytorch-probot bot commented Sep 22, 2021

CI Flow Status

⚛️ CI Flow

Ruleset - Version: v1
Ruleset - File: https://github.com/pytorch/pytorch/blob/c5cf8d54c21d66dd443a41b95f22e6a073264398/.github/generated-ciflow-ruleset.json
PR ciflow labels: ciflow/default

Workflows Labels (bold enabled) Status
Triggered Workflows
linux-bionic-py3.6-clang9 ciflow/all, ciflow/cpu, ciflow/default, ciflow/linux, ciflow/noarch, ciflow/xla ✅ triggered
linux-xenial-cuda11.3-py3.6-gcc7 ciflow/all, ciflow/cuda, ciflow/default, ciflow/linux ✅ triggered
linux-xenial-py3.6-gcc5.4 ciflow/all, ciflow/cpu, ciflow/default, ciflow/linux ✅ triggered
linux-xenial-py3.6-gcc7-bazel-test ciflow/all, ciflow/bazel, ciflow/cpu, ciflow/default, ciflow/linux ✅ triggered
win-vs2019-cpu-py3 ciflow/all, ciflow/cpu, ciflow/default, ciflow/win ✅ triggered
win-vs2019-cuda11.3-py3 ciflow/all, ciflow/cuda, ciflow/default, ciflow/win ✅ triggered
Skipped Workflows
libtorch-linux-xenial-cuda10.2-py3.6-gcc7 ciflow/all, ciflow/cuda, ciflow/libtorch, ciflow/linux 🚫 skipped
libtorch-linux-xenial-cuda11.3-py3.6-gcc7 ciflow/all, ciflow/cuda, ciflow/libtorch, ciflow/linux 🚫 skipped
linux-bionic-cuda10.2-py3.9-gcc7 ciflow/all, ciflow/cuda, ciflow/linux, ciflow/slow 🚫 skipped
linux-xenial-cuda10.2-py3.6-gcc7 ciflow/all, ciflow/cuda, ciflow/linux, ciflow/slow 🚫 skipped
parallelnative-linux-xenial-py3.6-gcc5.4 ciflow/all, ciflow/cpu, ciflow/linux 🚫 skipped
periodic-libtorch-linux-xenial-cuda11.1-py3.6-gcc7 ciflow/all, ciflow/cuda, ciflow/libtorch, ciflow/linux, ciflow/scheduled 🚫 skipped
periodic-linux-xenial-cuda11.1-py3.6-gcc7 ciflow/all, ciflow/cuda, ciflow/linux, ciflow/scheduled 🚫 skipped
periodic-win-vs2019-cuda11.1-py3 ciflow/all, ciflow/cuda, ciflow/scheduled, ciflow/win 🚫 skipped
puretorch-linux-xenial-py3.6-gcc5.4 ciflow/all, ciflow/cpu, ciflow/linux 🚫 skipped
win-vs2019-cuda10.2-py3 ciflow/all, ciflow/cuda, ciflow/win 🚫 skipped

You can add a comment to the PR and tag @pytorchbot with the following commands:
# ciflow rerun, "ciflow/default" will always be added automatically
@pytorchbot ciflow rerun

# ciflow rerun with additional labels "-l <ciflow/label_name>", which is equivalent to adding these labels manually and trigger the rerun
@pytorchbot ciflow rerun -l ciflow/scheduled -l ciflow/slow

For more information, please take a look at the CI Flow Wiki.

@facebook-github-bot
Copy link
Contributor

facebook-github-bot commented Sep 22, 2021

🔗 Helpful links

💊 CI failures summary and remediations

As of commit c5cf8d5 (more details on the Dr. CI page):


💚 💚 Looks good so far! There are no failures yet. 💚 💚


This comment was automatically generated by Dr. CI (expand for details).Follow this link to opt-out of these comments for your Pull Requests.

Please report bugs/suggestions to the (internal) Dr. CI Users group.

Click here to manually regenerate this comment.

@peterbell10 peterbell10 added module: porting Issues related to porting TH/THNN legacy to ATen native open source labels Sep 22, 2021
@peterbell10 peterbell10 requested a review from ngimel September 22, 2021 15:22
@ngimel
Copy link
Collaborator

ngimel commented Sep 23, 2021

@ngimel has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

@ngimel
Copy link
Collaborator

ngimel commented Sep 23, 2021

A lot of other projects (e.g. vision and fbgemm_gpu) directly include THC/THCAtomics.cuh, can we temporarily restore it (and make it just include <ATen/cuda/Atomic.cuh>) until we can fix those projects to include ATen/cuda/Atomic.cuh?

@peterbell10
Copy link
Collaborator Author

A lot of other projects (e.g. vision and fbgemm_gpu) directly include THC/THCAtomics.cuh, can we temporarily restore it (and make it just include <ATen/cuda/Atomic.cuh>) until we can fix those projects to include ATen/cuda/Atomic.cuh?

This PR already does that :) some torchvision stuff that's built as part of the rocm build was failing.

@ngimel
Copy link
Collaborator

ngimel commented Sep 23, 2021

Oh, great, didn't notice that. There are still internal breakages related to the new include that I thought were caused by file removal, but apparently not, I'll try to figure out what's going on (something about hipify, the error is

caffe2/aten/src/THC/THCAtomics.cuh:6:10: fatal error: ATen/hip/Atomic.cuh: No such file or directory

which indicates that THCAtomics is hipified, but the paths in the ATen are not?

@ngimel
Copy link
Collaborator

ngimel commented Sep 23, 2021

Trying a tentative fix

diff --git a/fbcode/caffe2/aten/src/THC/THCAtomics.cuh b/fbcode/caffe2/aten/src/THC/THCAtomics.cuh
--- a/fbcode/caffe2/aten/src/THC/THCAtomics.cuh
+++ b/fbcode/caffe2/aten/src/THC/THCAtomics.cuh
@@ -2,6 +2,6 @@
 // TODO: Remove once torchvision has been updated to use the ATen header
 #ifdef __CUDACC__
 #include <ATen/cuda/Atomic.cuh>
-#else
+#elif defined(__HIP_PLATFORM_HCC__)
 #include <ATen/hip/Atomic.cuh>
 #endif

@ngimel
Copy link
Collaborator

ngimel commented Sep 24, 2021

Yeah, just removing manual hipification is better, and rocm is passing.

@ngimel
Copy link
Collaborator

ngimel commented Sep 24, 2021

@ngimel has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

@facebook-github-bot
Copy link
Contributor

@ngimel merged this pull request in 963ae25.

peterbell10 added a commit to peterbell10/vision that referenced this pull request Sep 24, 2021
THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.
peterbell10 added a commit to peterbell10/vision that referenced this pull request Sep 24, 2021
THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.
datumbox added a commit to pytorch/vision that referenced this pull request Sep 27, 2021
* Update gpu atomics include path

THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.

* Empty commit to trigger build

Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>
@facebook-github-bot facebook-github-bot deleted the gh/peterbell10/140/head branch September 27, 2021 14:18
facebook-github-bot pushed a commit to pytorch/vision that referenced this pull request Sep 30, 2021
Summary:
* Update gpu atomics include path

THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.

* Empty commit to trigger build

Reviewed By: datumbox

Differential Revision: D31268022

fbshipit-source-id: 880981b5b4390a6853fe0061cd9a3be0afa733e7

Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>
husthyc added a commit to pytorch/vision that referenced this pull request Oct 22, 2021
* Update gpu atomics include path

THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.

* Empty commit to trigger build

Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>

[ghstack-poisoned]
husthyc added a commit to pytorch/vision that referenced this pull request Oct 22, 2021
* Update gpu atomics include path

THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.

* Empty commit to trigger build

Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>

[ghstack-poisoned]
cyyever pushed a commit to cyyever/vision that referenced this pull request Nov 16, 2021
* Update gpu atomics include path

THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.

* Empty commit to trigger build

Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla signed Merged module: porting Issues related to porting TH/THNN legacy to ATen native open source
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants