ROCm contributions week 29 by iotamudelta · Pull Request #9653 · pytorch/pytorch

iotamudelta · 2018-07-20T20:11:41Z

In this changeset:

improvements to hipify-python.py
marking unit tests broken for ROCm
reducing the number of jobs for the built to avoid out of memory issues
switch to Thrust/cub-hip master for the CI

Bring our fork up to date.

Merge from upstream master into our fork.

sync w/ upstream

…pigy

add pyHIPIFY to PyTorch repo

Update the copyright dates and reflect the reality that this has been a collaborative effort between AMD and Facebook in the last years.

Script is now included in pytorch source.

first round of changes to update PR

merge from upstream

This reverts commit 864dbe4.

next round of fixes to address comments

merge from upstream

After discussion in review, disable flake8 on pyHIPIFY for now.

.jenkins/pytorch/build.sh

+
+  # This environment variable enabled HCC Optimizations that speed up the linking stage.
+  # https://github.com/RadeonOpenCompute/hcc#hcc-with-thinlto-linking
+  # export KMTHINLTO=1


caffe2/CMakeLists.txt

-    aten_set_target_props(caffe2_hip)
-  ENDIF()
+  # Set standard properties on the target
+  aten_set_target_props(caffe2_hip)


Merge from upstream

Merge from upstream (to week29, fixes merge conflict)

…s_for_ROCm Rename BUILT_WITH_ROCM to TEST_WITH_ROCM and move to test.py

iotamudelta · 2018-07-26T16:50:16Z

resolved merge conflicts. @jithunnair-amd could you review to ensure I didn't screw anything up? thanks!

jithunnair-amd · 2018-07-27T05:08:05Z

@iotamudelta LGTM

iotamudelta · 2018-07-31T20:57:50Z

@pytorchbot retest this please

docker/caffe2/jenkins/common/install_rocm.sh

    git clone --recursive https://github.com/ROCmSoftwarePlatform/Thrust.git /data/Thrust
    rm -rf /data/Thrust/thrust/system/cuda/detail/cub-hip
    git clone --recursive https://github.com/ROCmSoftwarePlatform/cub-hip.git /data/Thrust/thrust/system/cuda/detail/cub-hip
-    cd /data/Thrust/thrust/system/cuda/detail/cub-hip && git checkout hip_port_1.7.4_caffe2 && cd -


ezyang

seems basically reasonable, but I see a Docker image change. Someone will need to deploy that change.

facebook-github-bot

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

ezyang · 2018-08-01T15:17:09Z

This needs a merge with master before I can land

iotamudelta · 2018-08-01T15:24:15Z

@jithunnair-amd I've merged again, could you check again w/ a second pair of eyes? Thanks!

cmake/public/LoadHIP.cmake

  set(PYTORCH_FOUND_HIP TRUE)

+  ### Remove setting of Flags when FindHIP.CMake PR #558 is accepted.###
+  # https://github.com/ROCm-Developer-Tools/HIP/pull/558 #


jithunnair-amd

SFSG

facebook-github-bot

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

Summary: In this changeset: * improvements to `hipify-python.py` * marking unit tests broken for ROCm * reducing the number of jobs for the built to avoid out of memory issues * switch to Thrust/cub-hip master for the CI Pull Request resolved: pytorch/pytorch#9653 Differential Revision: D9117791 Pulled By: ezyang fbshipit-source-id: a6c3c7b81f2bda9825974bf9bf89a97767244352

Summary: In this changeset: * improvements to `hipify-python.py` * marking unit tests broken for ROCm * reducing the number of jobs for the built to avoid out of memory issues * switch to Thrust/cub-hip master for the CI Pull Request resolved: pytorch#9653 Differential Revision: D9117791 Pulled By: ezyang fbshipit-source-id: a6c3c7b81f2bda9825974bf9bf89a97767244352

iotamudelta and others added 30 commits June 5, 2018 16:37

Merge pull request #1 from iotamudelta/master

54f582c

Bring our fork up to date.

Empty commit to test CI.

7fb4f1c

Merge remote-tracking branch 'upstream/master'

9a8276f

Merge pull request #6 from iotamudelta/master

d4f22c5

Merge from upstream master into our fork.

Merge remote-tracking branch 'upstream/master'

e1d6d1f

As per call - add pyHIPIFY directly to github.

627ef72

Merge pull request #8 from iotamudelta/master

a5bed70

sync w/ upstream

Merge remote-tracking branch 'rocm_upstream/master' into include_pyhi…

b22ef87

…pigy

Merge pull request #9 from iotamudelta/include_pyhipigy

e1c8500

add pyHIPIFY to PyTorch repo

autopep3 the pyHIPIFY scripts.

2fb3ba8

Include newer shared copyrith.

c132b49

Update the copyright dates and reflect the reality that this has been a collaborative effort between AMD and Facebook in the last years.

Do not clone pyHIPIFY repository.

87deef6

Script is now included in pytorch source.

Merge pull request #12 from iotamudelta/master

5645923

first round of changes to update PR

Merge remote-tracking branch 'upstream/master'

91738d9

Merge pull request #14 from iotamudelta/master

dc103d4

merge from upstream

Fix spelling of parenthesis.

c4fa8af

Get rid of flush/fsync.

79b1f45

Fix enum error that pep8 revealed.

c1d40f3

Line length fix.

864dbe4

Revert "Line length fix."

aa799ef

This reverts commit 864dbe4.

Send progress info to stderr by review comment.

4ad2f9e

Change to detail? as per review.

0e14afd

Document what the macros stand for.

5dac66e

raise exception if no kernel end found.

f2ca907

Convert to enum from magic numbers for function disable mode.

9eb80c9

Merge pull request #15 from iotamudelta/master

a333147

next round of fixes to address comments

Merge remote-tracking branch 'upstream/master'

88134e7

Merge pull request #16 from iotamudelta/master

c49615d

merge from upstream

After discussion in review, disable flake8 on pyHIPIFY for now.

f3eded3

Merge pull request #17 from iotamudelta/master

2f769c4

After discussion in review, disable flake8 on pyHIPIFY for now.

ezyang reviewed Jul 23, 2018

View reviewed changes

ezyang and others added 7 commits July 23, 2018 11:03

Merge branch 'master' into week29

b1b1b7d

Merge pull request #67 from iotamudelta/master

6c4068e

Merge from upstream

Merge pull request #68 from iotamudelta/master

a48a68b

Merge from upstream (to week29, fixes merge conflict)

Rename BUILT_WITH_ROCM to TEST_WITH_ROCM and move to test.py

5d8097b

Merge branch 'master' into disable_selected_unit_tests_for_ROCm

9c87933

Merge pull request #70 from jithunnair-amd/disable_selected_unit_test…

85cfdf6

…s_for_ROCm Rename BUILT_WITH_ROCM to TEST_WITH_ROCM and move to test.py

Merge branch 'master' into week29

5be0a71

zou3519 added the ready for review (this tag is deprecated) All PRs are ready for review unless they are draft, WIP, or have undismissed requested changes label Jul 31, 2018

Merge branch 'master' into week29

bfd1554

ezyang reviewed Aug 1, 2018

View reviewed changes

ezyang approved these changes Aug 1, 2018

View reviewed changes

facebook-github-bot reviewed Aug 1, 2018

View reviewed changes

Merge branch 'master' into week29

970fecb

jithunnair-amd reviewed Aug 1, 2018

View reviewed changes

cmake/public/LoadHIP.cmake

set(PYTORCH_FOUND_HIP TRUE)

### Remove setting of Flags when FindHIP.CMake PR #558 is accepted.###

# https://github.com/ROCm-Developer-Tools/HIP/pull/558 #

This comment was marked as off-topic.

Sign in to view

jithunnair-amd reviewed Aug 1, 2018

View reviewed changes

facebook-github-bot reviewed Aug 1, 2018

View reviewed changes

facebook-github-bot closed this in cfa0570 Aug 2, 2018

ezyang added open source merged labels Jun 24, 2019

jithunnair-amd deleted the week29 branch September 25, 2025 16:32

Conversation

iotamudelta commented Jul 20, 2018

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

iotamudelta commented Jul 26, 2018

Uh oh!

jithunnair-amd commented Jul 27, 2018

Uh oh!

iotamudelta commented Jul 31, 2018

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

ezyang left a comment

Choose a reason for hiding this comment

Uh oh!

facebook-github-bot left a comment

Choose a reason for hiding this comment

Uh oh!

ezyang commented Aug 1, 2018

Uh oh!

iotamudelta commented Aug 1, 2018

Uh oh!

This comment was marked as off-topic.

Uh oh!

jithunnair-amd left a comment

Choose a reason for hiding this comment

Uh oh!

facebook-github-bot left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants