Skip to content

Commit

Permalink
Use hip from 3.0 (#2483)
Browse files Browse the repository at this point in the history
  • Loading branch information
pfultz2 committed Mar 17, 2020
1 parent 78fdbe8 commit 9519d0d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
6 changes: 0 additions & 6 deletions Dockerfile
Expand Up @@ -66,11 +66,6 @@ RUN pip install https://github.com/pfultz2/rclone/archive/master.tar.gz
RUN rclone -b roc-3.0.x -c 286651a04d9c3a8e3052dd84b1822985498cd27d https://github.com/RadeonOpenCompute/hcc.git /hcc
RUN LDFLAGS=-fuse-ld=gold cget -p $PREFIX install hcc,/hcc && rm -rf /hcc

# Workaround hip: It doesn't use cmake's compiler, only the compiler at /opt/rocm/hcc/bin/hcc
RUN mkdir -p /opt/rocm/hcc/bin
RUN ln -s $PREFIX/bin/hcc /opt/rocm/hcc/bin/hcc
RUN ln -s $PREFIX/bin/hcc-config /opt/rocm/hcc/bin/hcc-config

# Make sure /opt/rcom is in the paths
ENV PATH="/opt/rocm:${PATH}"

Expand All @@ -83,7 +78,6 @@ ADD requirements.txt /requirements.txt
ADD min-requirements.txt /min-requirements.txt
RUN CXXFLAGS='-isystem $PREFIX/include' cget -p $PREFIX install -f /dev-requirements.txt


# Install doc requirements
ADD doc/requirements.txt /doc-requirements.txt
RUN pip install -r /doc-requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
@@ -1,5 +1,5 @@
pfultz2/rocm-recipes
ROCm-Developer-Tools/HIP@36529b168022a644685a194cfd5e402948c98e3c
ROCm-Developer-Tools/HIP@roc-3.0.0
-f requirements.txt
# 1.90+
danmar/cppcheck@dd05839a7e63ef04afd34711cb3e1e0ef742882f

0 comments on commit 9519d0d

Please sign in to comment.