Skip to content

Commit 5af7bf8

Browse files
committed
update from deven-dev01
1 parent 5bbb83b commit 5af7bf8

File tree

9 files changed

+41
-38
lines changed

9 files changed

+41
-38
lines changed

archive/create_eigen_patch.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
rm -rf eigen.patch.new
2-
diff -Naur eigen/eigen-eigen-429aa5254200 eigen_archive > eigen.patch.new.unsorted
3-
/home/deven/deven/common/scripts/tensorflow/eigen/sort_eigen_patch.py eigen.patch eigen.patch.new.unsorted eigen.patch.new
2+
diff -Naur eigen/eigen-eigen-6913f0cf7d06 eigen_archive > eigen.patch.new.unsorted
3+
/common/scripts/archive/sort_eigen_patch.py eigen.patch.foo eigen.patch.new.unsorted eigen.patch.new
44
rm -rf eigen.patch.new.unsorted
5-
cp eigen.patch.new /home/deven/deven/dockerx/eigen.patch

archive/sort_eigen_patch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /home/deven/anaconda3/bin/python
1+
#! /usr/bin/python
22

33
import sys
44
import re

docker/get_docker_image.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#docker_image=sunway513/hiptensorflow:tf18-rocm181-rc2-v1
1+
#docker_image=rocm/rocm-terminal:1.9.0
22
#docker_image=rocm/tensorflow:rocm1.8.2-tf1.8-python3-dev
3-
#docker_image=devenamd/tensorflow:tf18_rocm182_base_180727
4-
docker_image=rocm/rocm-terminal:1.8.2
5-
#docker_image=sunway513/hiptensorflow:rocm1.8.2-rc5-tf1.8-v1
3+
#docker_image=devenamd/eigen:eigen-upstream-rocm-v3
4+
#docker_image=rocmqa/tf18-9083-gfx900:ub18.04
5+
docker_image=rocm/tensorflow:rocm1.9.0-tf1.10-python3-dev
66

7-
container_name=deven_rocm182_base
7+
container_name=rocm190_tf_fusion
88

99
docker run \
1010
-it \

tensorflow/apply_tags.post.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
git checkout develop-upstream
22
git pull
3-
git tag merge-180723
3+
git tag merge-180917
44
git push --tags

tensorflow/apply_tags.pre.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
git checkout develop-upstream
2-
git tag merge-180723-prev
2+
git tag merge-180917-prev
33
git push --tags

tensorflow/install_hcc.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
rm -rf /root/hcc/
22
cd /root && git clone --recursive https://github.com/RadeonOpenCompute/hcc.git
3-
cd /root/hcc && git checkout -b issue812-fix d530be7
43
cd /root/hcc && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make package -j$(nproc) && dpkg -i *.deb
54

65

tensorflow/install_hip.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
rm -rf /root/HIP
2-
cd /root/ && git clone -b roc-1.8.x-pr457-altfix https://github.com/deven-amd/HIP.git
2+
cd /root/ && git clone https://github.com/ROCm-Developer-Tools/HIP.git
33
cd /root/HIP && mkdir build && cd build && cmake .. && make package -j$(nproc) && dpkg -i *.deb

tensorflow/prep_for_build.sh

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
# pip3 install setuptools --upgrade
44
# pip3 install protobuf --upgrade
5+
# pip3 install keras_applications==1.0.4 --no-deps
6+
# pip3 install keras_preprocessing==1.0.2 --no-deps
57

6-
# git config --locall user.email "[email protected]"
8+
# git config --local user.email "[email protected]"
79
# git config --local user.name "Deven Desai"
810

911

@@ -17,37 +19,39 @@ HOME=/root
1719

1820

1921
# rm -rf $HOME/HIP
20-
# cd $HOME && git clone -b roc-1.8.x-pr457 https://github.com/parallelo/HIP.git
21-
# #cd $HOME && git clone -b roc-1.8.x-pr457-altfix https://github.com/deven-amd/HIP.git
22-
# cd $HOME/HIP && mkdir build && cd build && cmake .. && make package -j$(nproc) && dpkg -i *.deb
22+
# #cd $HOME && git clone -b roc-1.8.x-pr457 https://github.com/parallelo/HIP.git
23+
# cd $HOME && git clone -b roc-1.8.x-pr457-altfix https://github.com/deven-amd/HIP.git
24+
# cd $HOME/HIP && rm -rf build && mkdir build && cd build && cmake .. && make package -j$(nproc) && dpkg -i *.deb
25+
# cd $HOME/HIP/build && make package -j$(nproc) && dpkg -i *.deb
2326

2427

25-
# apt-get update && apt-get install -y wget unzip libssl-dev libboost-dev libboost-system-dev libboost-filesystem-dev
28+
apt-get update && apt-get install -y wget unzip libssl-dev libboost-dev libboost-system-dev libboost-filesystem-dev
2629

27-
# rm -rf $HOME/rocm-cmake
28-
# cd $HOME && git clone https://github.com/RadeonOpenCompute/rocm-cmake.git
29-
# cd $HOME/rocm-cmake && mkdir build && cd build && cmake .. && make package -j$(nproc) && dpkg -i ./rocm-cmake*.deb
30+
rm -rf $HOME/rocm-cmake
31+
cd $HOME && git clone https://github.com/RadeonOpenCompute/rocm-cmake.git
32+
cd $HOME/rocm-cmake && mkdir build && cd build && cmake .. && make package -j$(nproc) && dpkg -i ./rocm-cmake*.deb
3033

31-
# rm -rf $HOME/MIOpenGEMM
32-
# cd $HOME && git clone https://github.com/ROCmSoftwarePlatform/MIOpenGEMM.git
33-
# cd $HOME/MIOpenGEMM && mkdir build && cd build && cmake .. && make package -j$(nproc) && dpkg -i ./miopengemm*.deb
34+
rm -rf $HOME/MIOpenGEMM
35+
cd $HOME && git clone https://github.com/ROCmSoftwarePlatform/MIOpenGEMM.git
36+
cd $HOME/MIOpenGEMM && mkdir build && cd build && cmake .. && make package -j$(nproc) && dpkg -i ./miopengemm*.deb
3437

35-
# rm -rf $HOME/half
36-
# cd $HOME && mkdir half && cd half && wget https://downloads.sourceforge.net/project/half/half/1.12.0/half-1.12.0.zip && unzip *.zip
38+
rm -rf $HOME/half
39+
cd $HOME && mkdir half && cd half && wget https://downloads.sourceforge.net/project/half/half/1.12.0/half-1.12.0.zip && unzip *.zip
3740

3841
# rm -rf $HOME/miopen
39-
# #cd $HOME && git clone -b 1.4.x https://github.com/AMDComputeLibraries/MLOpen.git miopen
40-
# #cd $HOME && git clone -b master https://github.com/ROCmSoftwarePlatform/MIOpen.git miopen
42+
# #manual# cd $HOME && git clone -b fusion-dev-core https://github.com/AMDComputeLibraries/MLOpen.git miopen
43+
# cd $HOME && git clone -b 1.4.x https://github.com/AMDComputeLibraries/MLOpen.git miopen
44+
# cd $HOME && git clone -b master https://github.com/ROCmSoftwarePlatform/MIOpen.git miopen
4145
# cd $HOME && git clone -b pr1061-fix https://github.com/deven-amd/MIOpen.git miopen
42-
cd $HOME/miopen && rm -rf build && mkdir build && cd build && \
43-
CXX=/opt/rocm/bin/hcc cmake \
44-
-DMIOPEN_BACKEND=HIP \
45-
-DCMAKE_PREFIX_PATH="/opt/rocm/hcc;/opt/rocm/hip" \
46-
-DCMAKE_CXX_FLAGS="-isystem /usr/include/x86_64-linux-gnu/" \
47-
-DHALF_INCLUDE_DIR=$HOME/half/include \
48-
-DCMAKE_BUILD_TYPE=Release \
49-
.. && \
50-
make package -j$(nproc) && dpkg -i ./MIOpen*.deb
46+
# cd $HOME/miopen && rm -rf build && mkdir build && cd build && \
47+
# CXX=/opt/rocm/bin/hcc cmake \
48+
# -DMIOPEN_BACKEND=HIP \
49+
# -DCMAKE_PREFIX_PATH="/opt/rocm/hcc;/opt/rocm/hip" \
50+
# -DCMAKE_CXX_FLAGS="-isystem /usr/include/x86_64-linux-gnu/" \
51+
# -DHALF_INCLUDE_DIR=$HOME/half/include \
52+
# -DCMAKE_BUILD_TYPE=Release \
53+
# .. && \
54+
# make package -j$(nproc) && dpkg -i ./MIOpen*.deb
5155

5256

5357
# version=0.15.0

tensorflow/run_unit_test_using_bazel.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
testname=$1
66

77
# do
8-
bazel test \
8+
bazel test \
99
--test_env=HIP_VISIBLE_DEVICES=0 \
1010
--test_sharding_strategy=disabled \
1111
--cache_test_results=no \
@@ -20,3 +20,4 @@ bazel test \
2020
# --test_env=MIOPEN_ENABLE_LOGGING=1 \
2121
# --test_env=MIOPEN_ENABLE_LOGGING_CMD=1 \
2222
# --test_env=HIP_TRACE_API=2 \
23+
# --config=monolithic \

0 commit comments

Comments
 (0)