Skip to content

[Caffe2] Enabling AMD GPU Backend for Caffe2 #7955

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.

Sign up for GitHub

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

Merged
bddppq merged 83 commits into from
Jun 4, 2018
Merged

[Caffe2] Enabling AMD GPU Backend for Caffe2 #7955

Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
ca6a441
Add hip support for caffe2 core
Apr 26, 2018
cb41397
Add MIOPEN header/wrapper to caffe2 core
Apr 26, 2018
18858cb
Add HIP device into caffe2 PB
Apr 26, 2018
51a49c1
top level makefile change for rocm/hip
May 1, 2018
3a48b1e
makefile scaffolding for AMD/RocM/HIP
May 1, 2018
b45a633
Makefile scafodding for AMD/RocM/HIP; add makefile/utility for HIP files
May 1, 2018
cda1da6
caffe2 PB update for AMD/ROCM HIP device
May 2, 2018
8f9c63a
Add AMD/RocM/Thrust dependency
May 4, 2018
a1171f0
Merge branch 'caffe2_core_hip' of github.com:petrex/pytorch into caff…
May 4, 2018
d867613
HIP threadpool update
May 4, 2018
666173d
Fix makefile macro
May 4, 2018
4609bc6
makefile fix: duplicate test/binary name
May 4, 2018
e9bdd6a
makefile clean-up
May 9, 2018
f5496be
makefile clean-up
May 9, 2018
7653aff
add HIP operator registry
May 9, 2018
8c7da75
add utilities for hip device
May 9, 2018
3db165a
Add USE_HIP to config summary
May 10, 2018
6525317
makefile fix for BUILD_TEST
May 15, 2018
7606aa1
merge latest and fix test build
May 15, 2018
0c0aa1b
merge latest
May 15, 2018
e19f33d
Fix indentation
May 15, 2018
de710b4
code clean-up
May 15, 2018
8bfa47f
Merge branch 'master' into caffe2_core_hip
bddppq May 15, 2018
00ebc31
Merge branch 'master' into caffe2_core_hip
bddppq May 15, 2018
5b01dc0
Merge branch 'master' into caffe2_core_hip
bddppq May 16, 2018
39e7253
Merge branch 'master' into caffe2_core_hip
bddppq May 16, 2018
fdf36d5
Guard builds without HIP and use the same cmake script as PyTorch to …
bddppq May 16, 2018
613ddf8
Merge remote-tracking branch 'origin/master' into caffe2_core_hip
bddppq May 16, 2018
df8ab43
Setup rocm environment variables in build.sh (ideally should be done …
bddppq May 16, 2018
540306e
setup locale
bddppq May 16, 2018
8ec58db
set HIP_PLATFORM
bddppq May 16, 2018
1697b92
Revert "set HIP_PLATFORM"
bddppq May 16, 2018
ac613b0
continue the build script environment variables mess
bddppq May 16, 2018
94e9569
HCC_AMDGPU_TARGET
bddppq May 16, 2018
213689e
Cleanup the mess, has been fixed in the lastest docker images
bddppq May 16, 2018
098313f
Merge remote-tracking branch 'origin/master' into caffe2_core_hip
bddppq May 16, 2018
edb048a
Merge remote-tracking branch 'origin/master' into caffe2_core_hip
bddppq May 16, 2018
09cf458
Assign protobuf field hip_gpu_id a new field number for backward comp…
bddppq May 16, 2018
5368a9c
change name to avoid conflict
bddppq May 17, 2018
f0b0184
Merge branch 'master' into caffe2_core_hip
bddppq May 17, 2018
199831d
Merge remote-tracking branch 'upstream/master' into caffe2_core_hip
May 17, 2018
69ffbed
Merge branch 'master' into caffe2_core_hip
bddppq May 18, 2018
de3437b
Merge branch 'master' into caffe2_core_hip
bddppq May 18, 2018
8469d2a
Merge remote-tracking branch 'origin/master' into caffe2_core_hip
bddppq May 18, 2018
90afe3e
Fix duplicated thread pool flag
bddppq May 18, 2018
69ddbc8
Refactor cmake files to not add hip includes and libs globally
bddppq May 18, 2018
20f5870
Merge remote-tracking branch 'origin/master' into caffe2_core_hip
bddppq May 18, 2018
e7a068f
Merge branch 'caffe2_core_hip' of github.com:petrex/pytorch into caff…
May 18, 2018
61846e7
Merge remote-tracking branch 'origin/master' into caffe2_core_hip
bddppq May 18, 2018
868e39e
Merge branch 'master' into caffe2_core_hip
bddppq May 18, 2018
f77b1ca
Merge branch 'master' into caffe2_core_hip
bddppq May 19, 2018
bf7446a
Fix the wrong usage of environment variables detection in cmake
bddppq May 19, 2018
8fbb954
Merge branch 'master' into caffe2_core_hip
bddppq May 21, 2018
145a7c6
Merge branch 'caffe2_core_hip' of github.com:petrex/pytorch into caff…
May 21, 2018
758e5b2
Merge branch 'master' into caffe2_core_hip
bddppq May 22, 2018
50eadcf
Merge branch 'master' into caffe2_core_hip
bddppq May 22, 2018
e88cf91
Merge branch 'master' into caffe2_core_hip
bddppq May 23, 2018
f76bd00
Merge branch 'master' into caffe2_core_hip
bddppq May 23, 2018
e7a80cd
Merge branch 'caffe2_core_hip' of github.com:petrex/pytorch into caff…
May 23, 2018
6e89ad4
Add MIOPEN CNN operators
May 23, 2018
3eb604e
Revert "Add MIOPEN CNN operators"
May 23, 2018
6786b20
Merge branch 'master' into caffe2_core_hip
bddppq May 30, 2018
d5d8a69
Resolve merge conflicts
bddppq May 30, 2018
c690b1f
.
bddppq May 30, 2018
47a14c3
Merge branch 'master' into caffe2_core_hip
bddppq May 31, 2018
8becd40
Update GetAsyncNetHIPThreadPool
bddppq May 31, 2018
ee01f09
Merge remote-tracking branch 'origin/master' into caffe2_core_hip
bddppq May 31, 2018
e51afb1
Merge branch 'master' into caffe2_core_hip
bddppq Jun 1, 2018
e7d0234
Merge remote-tracking branch 'origin/master' into caffe2_core_hip
bddppq Jun 1, 2018
4fab330
Enable BUILD_CAFFE2 in pytorch build
bddppq Jun 2, 2018
18cfc2b
Merge branch 'master' into caffe2_core_hip
bddppq Jun 4, 2018
ad7b5a8
Unifiy USE_HIP and USE_ROCM
bddppq Jun 4, 2018
a4f29be
always check USE_ROCM
bddppq Jun 4, 2018
175f3d2
.
bddppq Jun 4, 2018
ca54b37
Merge remote-tracking branch 'origin/master' into caffe2_core_hip
bddppq Jun 4, 2018
ca0244d
remove unrelated change
bddppq Jun 4, 2018
9526670
move all core hip files to separate subdirectory
bddppq Jun 4, 2018
e4538d5
.
bddppq Jun 4, 2018
dd5f73f
.
bddppq Jun 4, 2018
f71d33c
recurse glob core directory
bddppq Jun 4, 2018
c1f46ee
.
bddppq Jun 4, 2018
8f0000b
correct include
bddppq Jun 4, 2018
325ca0e
.
bddppq Jun 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
.
  • Loading branch information
@bddppq
bddppq committed Jun 4, 2018
commit c1f46ee9b0ff43c96cb12c13c5d8499a447b721c
25 changes: 12 additions & 13 deletions caffe2/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,46 @@
# ---[ GPU files
# ------[ cuDNN
file(GLOB_RECURSE tmp *_cudnn.cc)
file(GLOB tmp *_cudnn.cc)
set(Caffe2_GPU_SRCS ${Caffe2_GPU_SRCS} ${tmp})
# ------[ general GPU
file(GLOB_RECURSE tmp *_gpu.cc)
file(GLOB tmp *_gpu.cc)
set(Caffe2_GPU_SRCS ${Caffe2_GPU_SRCS} ${tmp})
# ------[ CUDA sources
file(GLOB_RECURSE tmp *.cu)
file(GLOB tmp *.cu)
set(Caffe2_GPU_SRCS ${Caffe2_GPU_SRCS} ${tmp})
# exclude test files
file(GLOB_RECURSE tmp *_test.cc)
file(GLOB tmp *_test.cc)
exclude(Caffe2_GPU_SRCS "${Caffe2_GPU_SRCS}" ${tmp})

# ---[ HIP files
# ------[ HIP Sources
file(GLOB_RECURSE_RECURSE tmp *_hip.cc)
file(GLOB_RECURSE tmp *_hip.cc)
set(Caffe2_HIP_SRCS ${Caffe2_HIP_SRCS} ${tmp})
# ------[ MIOpen files
file(GLOB_RECURSE_RECURSE tmp *_miopen.cc)
file(GLOB_RECURSE tmp *_miopen.cc)
set(Caffe2_HIP_SRCS ${Caffe2_HIP_SRCS} ${tmp})
# exclude test files
file(GLOB_RECURSE_RECURSE tmp *_test.cc)
file(GLOB_RECURSE tmp *_test.cc)
exclude(Caffe2_HIP_SRCS "${Caffe2_HIP_SRCS}" ${tmp})

# ---[ CPU files.
file(GLOB_RECURSE tmp *.cc)
file(GLOB tmp *.cc)
set(Caffe2_CPU_SRCS ${Caffe2_CPU_SRCS} ${tmp})
# exclude test files and gpu files
file(GLOB_RECURSE tmp *_test.cc)
file(GLOB tmp *_test.cc)
exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${tmp})
exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${Caffe2_GPU_SRCS})
exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${Caffe2_HIP_SRCS})

# ---[ GPU test files
file(GLOB_RECURSE tmp *_gpu_test.cc)
file(GLOB tmp *_gpu_test.cc)
set(Caffe2_GPU_TEST_SRCS ${Caffe2_GPU_TEST_SRCS} ${tmp})

# ---[ HIP test files
file(GLOB_RECURSE_RECURSE tmp *_hip_test.cc)
file(GLOB_RECURSE tmp *_hip_test.cc)
set(Caffe2_HIP_TEST_SRCS ${Caffe2_HIP_TEST_SRCS} ${tmp})

# ---[ CPU test files
file(GLOB_RECURSE tmp *_test.cc)
file(GLOB tmp *_test.cc)
set(Caffe2_CPU_TEST_SRCS ${Caffe2_CPU_TEST_SRCS} ${tmp})
exclude(Caffe2_CPU_TEST_SRCS "${Caffe2_CPU_TEST_SRCS}" ${Caffe2_GPU_TEST_SRCS})
exclude(Caffe2_CPU_TEST_SRCS "${Caffe2_CPU_TEST_SRCS}" ${Caffe2_HIP_TEST_SRCS})
Expand Down