Add pyHIPIFY scripts needed for ROCm transpilation to PyTorch #8812

iotamudelta · 2018-06-22T23:05:09Z

As discussed in call, this will allow us to keep this integral part of the effort to run PyTorch on ROCm in sync with the main code.

Bring our fork up to date.

Merge from upstream master into our fork.

sync w/ upstream

…pigy

add pyHIPIFY to PyTorch repo

bddppq

Thanks for merging these python scripts into pytorch repo.
The CI failure is python code lint check, you can use autopep8 to automatically make them conforming the style requirements.

tools/amd_build/pyHIPIFY/hipify-python.py

+#!/usr/bin/python
+""" The Python Hipify script.
+##
+# Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.


soumith · 2018-06-23T18:32:24Z

the script is failing lint

tools/amd_build/build_pytorch_amd.py

        "--output-directory", proj_dir,
        "--include-dirs"] + include_dirs + ["--yaml-settings", yaml_file, "--add-static-casts", "True"]
-os.execv("/opt/rocm/bin/hipify-python.py", ['python'] + args)
+os.execv(os.path.join(amd_build_dir, "pyHIPIFY", "hipify-python.py"), ['python'] + args)


tools/amd_build/pyHIPIFY/constants.py

@@ -0,0 +1,47 @@
+CONV_VERSION = 0,


tools/amd_build/pyHIPIFY/cuda_to_hip_mappings.py

@@ -0,0 +1,2097 @@
+from constants import *
+
+CUDA_TYPE_NAME_MAP = {


tools/amd_build/pyHIPIFY/cuda_to_hip_mappings.py

+     "CU_RES_VIEW_FORMAT_FLOAT_2X16": ("hipResViewFormatHalf2", CONV_TEX,API_DRIVER),
+     "CU_RES_VIEW_FORMAT_FLOAT_4X16": ("hipResViewFormatHalf4", CONV_TEX,API_DRIVER),
+     "CU_RES_VIEW_FORMAT_FLOAT_1X32": ("hipResViewFormatFloat1", CONV_TEX,API_DRIVER),
+     "CU_RES_VIEW_FORMAT_FLOAT_2X32": ("hipResVi


tools/amd_build/pyHIPIFY/hipify-python.py

+
+                # Update the progress
+                print(os.path.join(dirpath, filename))
+                update_progress_bar(total_files, current_file)


tools/amd_build/pyHIPIFY/hipify-python.py

+
+def openf(filename, mode):
+   if sys.version_info[0] == 3:
+      return open(filename, mode, errors='ignore')


tools/amd_build/pyHIPIFY/hipify-python.py

+        status)
+
+    # Send the progress to stdout.
+    sys.stdout.write(text)


tools/amd_build/pyHIPIFY/hipify-python.py

+
+def filename_ends_with_extension(filename, extensions):
+    """Helper method to see if filename ends with certain extension"""
+    return reduce(lambda result, ext: filename.endswith("." + ext) or result, extensions, False)


tools/amd_build/pyHIPIFY/hipify-python.py

+def processKernelLaunches(string, stats):
+    """ Replace the CUDA style Kernel launches with the HIP style kernel launches."""
+    # Concat the namespace with the kernel names. (Find cleaner way of doing this later).
+    string = re.sub(r'([ ]+)(detail+)::[ ]+\\\n[ ]+', lambda inp: "%s%s::" % (inp.group(1), inp.group(2)), string)


tools/amd_build/pyHIPIFY/hipify-python.py

+    return output_string
+
+
+def find_paranthesis_end(input_string, start):


Address even more comments

Fix static_cast logic in hipify script for better coverage

Add enum34 as a requirement for backwards compatibility.

Merge from upstream

Use generator directly in loop as by review

String inputs should have meta characters escaped prior to using them with regular expressions.

This reverts commit 4158af1.

The inputs into the regular expressions must have their meta characters escaped or unexpected replacements may occur.

This reverts commit cf2c228.

test

This reverts commit 08043e3.

facebook-github-bot

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

Summary: This PR contains the ROCm contributions of last week: * documentation of pyHIPIFY data format originating from #8812 reviewing comments by ezyang * removal of most patch files from the `amd_build` directory and integration into the code base * enabling of previously disabled_features that do compile now * improvement to the static_cast feature in pyHIPIFY (it will only apply static_cast to kernel arguments, not launch arguments) * addition of two workarounds to pyHIPIFY for ROCm/HIP shortcomings: a) `__forceinline__` does not imply `static`, hence change to `__inline__`, b) `std::[exp,log,pow]` math functions cannot be selected in device code, use `::[exp,log,pow]` instead. Both of these workarounds will be removed once the issues are fixed upstream. Neither of these issues have surfaced on the CI but were reproduced internally. Pull Request resolved: #9432 Differential Revision: D8887441 Pulled By: ezyang fbshipit-source-id: 71cf5c6b13772a66d10be369a45ebf06e4e268e1

Summary: This PR contains the ROCm contributions of last week: * documentation of pyHIPIFY data format originating from pytorch#8812 reviewing comments by ezyang * removal of most patch files from the `amd_build` directory and integration into the code base * enabling of previously disabled_features that do compile now * improvement to the static_cast feature in pyHIPIFY (it will only apply static_cast to kernel arguments, not launch arguments) * addition of two workarounds to pyHIPIFY for ROCm/HIP shortcomings: a) `__forceinline__` does not imply `static`, hence change to `__inline__`, b) `std::[exp,log,pow]` math functions cannot be selected in device code, use `::[exp,log,pow]` instead. Both of these workarounds will be removed once the issues are fixed upstream. Neither of these issues have surfaced on the CI but were reproduced internally. Pull Request resolved: pytorch#9432 Differential Revision: D8887441 Pulled By: ezyang fbshipit-source-id: 71cf5c6b13772a66d10be369a45ebf06e4e268e1

…h#8812) Summary: As discussed in call, this will allow us to keep this integral part of the effort to run PyTorch on ROCm in sync with the main code. Pull Request resolved: pytorch#8812 Reviewed By: ezyang Differential Revision: D8796245 Pulled By: bddppq fbshipit-source-id: 8e12c2acf6a7e0740f31b21e50be74e10ed8b12c

Summary: This PR contains the ROCm contributions of last week: * documentation of pyHIPIFY data format originating from pytorch#8812 reviewing comments by ezyang * removal of most patch files from the `amd_build` directory and integration into the code base * enabling of previously disabled_features that do compile now * improvement to the static_cast feature in pyHIPIFY (it will only apply static_cast to kernel arguments, not launch arguments) * addition of two workarounds to pyHIPIFY for ROCm/HIP shortcomings: a) `__forceinline__` does not imply `static`, hence change to `__inline__`, b) `std::[exp,log,pow]` math functions cannot be selected in device code, use `::[exp,log,pow]` instead. Both of these workarounds will be removed once the issues are fixed upstream. Neither of these issues have surfaced on the CI but were reproduced internally. Pull Request resolved: pytorch#9432 Differential Revision: D8887441 Pulled By: ezyang fbshipit-source-id: 71cf5c6b13772a66d10be369a45ebf06e4e268e1

iotamudelta and others added 9 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

iotamudelta requested review from apaszke, colesbury, ezyang, gchanan, soumith and zdevito as code owners June 22, 2018 23:05

bddppq self-requested a review June 23, 2018 17:57

bddppq reviewed Jun 23, 2018

View reviewed changes

dagamayank mentioned this pull request Jun 24, 2018

PyTorch AMD #8810

Closed

ezyang reviewed Jun 24, 2018

View reviewed changes

tools/amd_build/pyHIPIFY/constants.py

@@ -0,0 +1,47 @@

CONV_VERSION = 0,

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

ezyang reviewed Jun 24, 2018

View reviewed changes

tools/amd_build/pyHIPIFY/cuda_to_hip_mappings.py

@@ -0,0 +1,2097 @@

from constants import *

CUDA_TYPE_NAME_MAP = {

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

ezyang reviewed Jun 24, 2018

View reviewed changes

tools/amd_build/pyHIPIFY/hipify-python.py Outdated

def openf(filename, mode):

if sys.version_info[0] == 3:

return open(filename, mode, errors='ignore')

This comment was marked as off-topic.

Sign in to view

ezyang reviewed Jun 24, 2018

View reviewed changes

tools/amd_build/pyHIPIFY/hipify-python.py Outdated

status)

# Send the progress to stdout.

sys.stdout.write(text)

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

ezyang reviewed Jun 24, 2018

View reviewed changes

tools/amd_build/pyHIPIFY/hipify-python.py Outdated

return output_string

def find_paranthesis_end(input_string, start):

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

jithunnair-amd and others added 12 commits July 9, 2018 13:13

Merge branch 'master' into hipify_changes

b8463a1

Add comments for add_static_cast and extract_arguments functions

acfacbc

Merge pull request #21 from iotamudelta/master

c837468

Address even more comments

Merge pull request #20 from jithunnair-amd/hipify_changes

e852434

Fix static_cast logic in hipify script for better coverage

Add enum34 as a requirement for backwards compatibility.

99c9980

Merge pull request #23 from iotamudelta/master

ba93514

Add enum34 as a requirement for backwards compatibility.

Merge remote-tracking branch 'upstream/master'

dd358c5

Merge pull request #24 from iotamudelta/master

6af217c

Merge from upstream

Merge remote-tracking branch 'upstream/master'

907c9f1

Merge pull request #25 from iotamudelta/master

22a194d

Merge from upstream

Use generator directly in loop as by review

89e0c38

Merge pull request #26 from iotamudelta/master

f902961

Use generator directly in loop as by review

dagamayank mentioned this pull request Jul 10, 2018

PyTorch/Caffe2 Build Path Changes (ROCm path) + MIOpen Integration #8257

Closed

Jorghi12 and others added 6 commits July 10, 2018 16:56

Escape input strings

4158af1

String inputs should have meta characters escaped prior to using them with regular expressions.

Revert "Escape input strings". No direct commits to this repository.

9c9dfbb

This reverts commit 4158af1.

Escape inputs into reg. ex.

cf2c228

The inputs into the regular expressions must have their meta characters escaped or unexpected replacements may occur.

Revert "Escape inputs into reg. ex." Still no direct commits to master.

ce2c9ed

This reverts commit cf2c228.

test

08043e3

test

Revert "test". No direct commits.

ca3b5ed

This reverts commit 08043e3.

facebook-github-bot reviewed Jul 11, 2018

View reviewed changes

facebook-github-bot closed this in b4c6645 Jul 11, 2018

iotamudelta mentioned this pull request Jul 13, 2018

ROCm contributions week 28 #9432

Closed

ezyang added open source merged labels Jun 24, 2019

		@@ -0,0 +1,2097 @@
		from constants import *

		CUDA_TYPE_NAME_MAP = {

		return output_string


		def find_paranthesis_end(input_string, start):

Add pyHIPIFY scripts needed for ROCm transpilation to PyTorch #8812

Add pyHIPIFY scripts needed for ROCm transpilation to PyTorch #8812

Uh oh!

Conversation

iotamudelta commented Jun 22, 2018

Uh oh!

bddppq left a comment

Choose a reason for hiding this comment

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!

soumith commented Jun 23, 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!

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!

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!

facebook-github-bot left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants