[ROCm] Fix compiler unwrapping step in jenkins build scripts for Caffe2/PyTorch on ROCm by iotamudelta · Pull Request #25409 · pytorch/pytorch

iotamudelta · 2019-08-29T18:15:55Z

Fix the regex (requires enabling extglob) for two digit clang releases.

While there, also fix it for three digit releases with the hope that I
do not need to touch it for some time.

Unfortunately, this regex requires extglob to be enabled in the shell.

While there, also fix it for three digit releases with the hope that I do not need to touch it for some time.

iotamudelta · 2019-08-29T18:57:56Z

@pytorchbot retest this please

ezyang

lol

ezyang · 2019-08-29T19:51:09Z

@pytorchbot rebase this please

pytorchbot · 2019-08-29T19:51:13Z

Sorry, I can't merge this because there are conflicts. To merge this yourself, run the commands below:

git fetch origin master
git fetch git@github.com:iotamudelta/pytorch.git fix_regex_twodigit_clang
git checkout FETCH_HEAD
git merge origin/master
git push git@github.com:iotamudelta/pytorch.git HEAD:fix_regex_twodigit_clang

(To learn more about this bot, see Bot commands.)

ezyang · 2019-08-29T19:51:38Z

Kinnae have a rebase

…t_clang

The other shopt resides there as well

ezyang · 2019-08-29T20:39:19Z

@pytorchbot rebase this please

pytorchbot · 2019-08-29T20:39:21Z

There's nothing to do! This branch is already up to date with master (1ea1d7f).

(To learn more about this bot, see Bot commands.)

ezyang · 2019-08-29T20:39:39Z


Aug 29 20:10:03 ./.jenkins/caffe2/build.sh: line 282: syntax error near unexpected token `('

ailzhang · 2019-09-04T18:01:47Z

@pytorchbot rebase this please

pytorchbot · 2019-09-04T18:01:52Z

Sorry, I can't merge this because there are conflicts. To merge this yourself, run the commands below:

git fetch origin master
git fetch git@github.com:iotamudelta/pytorch.git fix_regex_twodigit_clang
git checkout FETCH_HEAD
git merge origin/master
git push git@github.com:iotamudelta/pytorch.git HEAD:fix_regex_twodigit_clang

(To learn more about this bot, see Bot commands.)

…twodigit_clang

li-roy · 2019-09-06T18:34:47Z

@pytorchbot retest this please

ezyang · 2019-09-09T13:11:28Z

@pytorchbot rebase this please

pytorchbot · 2019-09-09T13:11:33Z

Sorry, I can't merge this because there are conflicts. To merge this yourself, run the commands below:

git fetch origin master
git fetch git@github.com:iotamudelta/pytorch.git fix_regex_twodigit_clang
git checkout FETCH_HEAD
git merge origin/master
git push git@github.com:iotamudelta/pytorch.git HEAD:fix_regex_twodigit_clang

(To learn more about this bot, see Bot commands.)

…twodigit_clang

iotamudelta · 2019-09-09T21:10:35Z

@pytorchbot retest this please

iotamudelta · 2019-09-10T18:18:18Z

@pytorchbot rebase this please

pytorchbot · 2019-09-10T18:18:23Z

Sorry, I can't merge this because there are conflicts. To merge this yourself, run the commands below:

git fetch origin master
git fetch git@github.com:iotamudelta/pytorch.git fix_regex_twodigit_clang
git checkout FETCH_HEAD
git merge origin/master
git push git@github.com:iotamudelta/pytorch.git HEAD:fix_regex_twodigit_clang

(To learn more about this bot, see Bot commands.)

…twodigit_clang

zou3519

Builds appear to be failing

…twodigit_clang

iotamudelta · 2019-09-13T18:08:32Z

yes, the failures seem real. they fall through to the ROCm line (?!) and since shopt extglob was not enabled, the syntax is unknown.

@ezyang any ideas/suggestions here?

ezyang · 2019-09-13T18:56:42Z

Maybe shopt has to be placed in the actual source file itself, as it affects parsing?

iotamudelta · 2019-09-13T19:00:23Z

the ROCm tests which should be the only ones affected by the change pass though

ezyang · 2019-09-16T14:22:41Z

Oh, I bet it's something dumb like, we're running different versions of bash/sh in the CI jobs, and ROCm's is new enough to understand the syntax, but the other ones aren't. Are you sure you can't rewrite this test to do something else?

extglob there, add and use a helper script

iotamudelta · 2019-09-17T15:58:33Z

I've moved it into a helper script that enables extglob - let's see if that does the trick!

Hardcode everything to bash

iotamudelta · 2019-09-17T19:30:32Z

@zou3519 can you revisit? Thanks!

facebook-github-bot

@bddppq is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

facebook-github-bot · 2019-09-17T23:41:40Z

@bddppq merged this pull request in 71d3457.

…rch on ROCm (pytorch#25409) Summary: Fix the regex (requires enabling extglob) for two digit clang releases. While there, also fix it for three digit releases with the hope that I do not need to touch it for some time. Unfortunately, this regex requires extglob to be enabled in the shell. Pull Request resolved: pytorch#25409 Differential Revision: D17431786 Pulled By: bddppq fbshipit-source-id: a50b2ff525d9b6046deae9c8725c92d67119599a

Fix the regex (requires enabling extglob) for two digit clang releases.

8cc9f2b

While there, also fix it for three digit releases with the hope that I do not need to touch it for some time.

iotamudelta added module: rocm AMD GPU support for Pytorch open source labels Aug 29, 2019

iotamudelta requested review from bddppq and ezyang August 29, 2019 18:15

pytorchbot added the module: ci Related to continuous integration label Aug 29, 2019

ezyang approved these changes Aug 29, 2019

View reviewed changes

iotamudelta added 2 commits August 29, 2019 14:56

Merge remote-tracking branch 'upstream/master' into fix_regex_twodigi…

061e32b

…t_clang

Put the shopt enablement of extglob into the common file.

dcd09a1

The other shopt resides there as well

Move shopt enablement into common file

f6bc932

iotamudelta and others added 2 commits September 5, 2019 10:17

Merge remote-tracking branch 'rocm_upstream/upstream' into fix_regex_…

302d87f

…twodigit_clang

Merge remote-tracking branch 'rocm_upstream/upstream' into fix_regex_…

3b59c78

…twodigit_clang

Merge remote-tracking branch 'rocm_upstream/upstream' into fix_regex_…

92e2488

…twodigit_clang

Merge remote-tracking branch 'rocm_upstream/upstream' into fix_regex_…

77be73c

…twodigit_clang

zou3519 requested changes Sep 13, 2019

View reviewed changes

Merge remote-tracking branch 'rocm_upstream/upstream' into fix_regex_…

262682d

…twodigit_clang

Instead of doing the unwrapping in the main build scripts and mess with

2444415

extglob there, add and use a helper script

Previous setup couldn't enable shopt.

ddaba42

Hardcode everything to bash

cpuhrsch added the triaged This issue has been looked at a team member, and triaged and prioritized into an appropriate module label Sep 17, 2019

bddppq approved these changes Sep 17, 2019

View reviewed changes

facebook-github-bot reviewed Sep 17, 2019

View reviewed changes

facebook-github-bot closed this in 71d3457 Sep 17, 2019

iotamudelta deleted the fix_regex_twodigit_clang branch September 17, 2019 20:57

facebook-github-bot added the merged label Sep 17, 2019

mruberry added the Merged label Oct 28, 2020

Conversation

iotamudelta commented Aug 29, 2019

Uh oh!

iotamudelta commented Aug 29, 2019

Uh oh!

ezyang left a comment

Choose a reason for hiding this comment

Uh oh!

ezyang commented Aug 29, 2019

Uh oh!

pytorchbot commented Aug 29, 2019

Uh oh!

ezyang commented Aug 29, 2019

Uh oh!

ezyang commented Aug 29, 2019

Uh oh!

pytorchbot commented Aug 29, 2019

Uh oh!

ezyang commented Aug 29, 2019

Uh oh!

ailzhang commented Sep 4, 2019

Uh oh!

pytorchbot commented Sep 4, 2019

Uh oh!

li-roy commented Sep 6, 2019

Uh oh!

ezyang commented Sep 9, 2019

Uh oh!

pytorchbot commented Sep 9, 2019

Uh oh!

iotamudelta commented Sep 9, 2019

Uh oh!

iotamudelta commented Sep 10, 2019

Uh oh!

pytorchbot commented Sep 10, 2019

Uh oh!

zou3519 left a comment

Choose a reason for hiding this comment

Uh oh!

iotamudelta commented Sep 13, 2019

Uh oh!

ezyang commented Sep 13, 2019

Uh oh!

iotamudelta commented Sep 13, 2019

Uh oh!

ezyang commented Sep 16, 2019

Uh oh!

iotamudelta commented Sep 17, 2019

Uh oh!

iotamudelta commented Sep 17, 2019

Uh oh!

facebook-github-bot left a comment

Choose a reason for hiding this comment

Uh oh!

facebook-github-bot commented Sep 17, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants