Properly link hip cmake file into top level lib directory.

Change-Id: I2113a86ca6985f34fd0cfb091abdbce0f632cfc2
Tento commit je obsažen v:
James Edwards
2017-04-21 22:34:26 -05:00
rodič c5e1235f64
revize c33c84a596
2 změnil soubory, kde provedl 17 přidání a 8 odebrání
+10 -5
Zobrazit soubor
@@ -8,17 +8,22 @@ popd () {
} }
ROCMDIR=/opt/rocm ROCMDIR=/opt/rocm
HIPDIR=$ROCMDIR/hip
# Soft-link to libraries
HIPLIBFILES=$HIPDIR/lib/*
ROCMLIBDIR=$ROCMDIR/lib ROCMLIBDIR=$ROCMDIR/lib
HIPDIR=$ROCMDIR/hip
HIPLIBDIR=$ROCMDIR/hip/lib
# Soft-link to library files
HIPLIBFILES=$(ls -aF $HIPLIBDIR | grep -v [-/$])
mkdir -p $ROCMLIBDIR mkdir -p $ROCMLIBDIR
mkdir -p $ROCMLIBDIR/cmake
pushd $ROCMLIBDIR pushd $ROCMLIBDIR
for f in $HIPLIBFILES for f in $HIPLIBFILES
do do
ln -s $f $(basename $f) ln -s $f $(basename $f)
done done
ln -s $HIPDIR/lib/.hipInfo .hipInfo # Make the hip cmake directory link.
pushd cmake
ln -s $HIPLIBDIR/cmake/hip hip
popd
popd popd
+7 -3
Zobrazit soubor
@@ -9,17 +9,21 @@ popd () {
} }
ROCMDIR=/opt/rocm ROCMDIR=/opt/rocm
ROCMLIBDIR=$ROCMDIR/lib
HIPDIR=$ROCMDIR/hip HIPDIR=$ROCMDIR/hip
HIPLIBDIR=$ROCMDIR/hip/lib
# Remove soft-links to libraries # Remove soft-links to libraries
HIPLIBFILES=$HIPDIR/lib/* HIPLIBFILES=$(ls -aF $HIPLIBDIR | grep -v [-/$])
ROCMLIBDIR=$ROCMDIR/lib
pushd $ROCMLIBDIR pushd $ROCMLIBDIR
for f in $HIPLIBFILES for f in $HIPLIBFILES
do do
rm $(basename $f) rm $(basename $f)
done done
rm .hipInfo pushd cmake
unlink hip
popd
rmdir --ignore-fail-on-non-empty cmake
popd popd
rmdir --ignore-fail-on-non-empty $ROCMLIBDIR rmdir --ignore-fail-on-non-empty $ROCMLIBDIR