Skip to content

Commit 30329fc

Browse files
arcade linux build (#5423)
* arcade linux build * put file execution permission change into source control
1 parent 62cdfa0 commit 30329fc

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
1010
done
1111
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1212

13-
"$DIR/run.sh" build "$@"
13+
"$DIR/eng/common/build.sh" --restore --build --pack --warnAsError false

eng/common/build.sh

100644100755
File mode changed.

eng/common/dotnet-install.sh

100644100755
File mode changed.

src/Native/build.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ RootRepo="$DIR/../.."
2525
__build_arch=
2626
__strip_argument=
2727
__configuration=Debug
28-
__rootBinPath="$RootRepo/bin"
29-
__baseIntermediateOutputPath="$__rootBinPath/obj"
28+
__rootBinPath="$RootRepo/artifacts/bin"
29+
__baseIntermediateOutputPath="$RootRepo/artifacts/obj"
3030
__versionSourceFile="$__baseIntermediateOutputPath/version.c"
3131
__mkllibpath=""
3232
__mkllibrpath=""
@@ -65,12 +65,14 @@ done
6565

6666
__cmake_defines="-DCMAKE_BUILD_TYPE=${__configuration} ${__strip_argument} -DMKL_LIB_PATH=${__mkllibpath} -DMKL_LIB_RPATH=${__mkllibrpath}"
6767

68-
__IntermediatesDir="$__baseIntermediateOutputPath/$__build_arch.$__configuration/Native"
69-
__BinDir="$__rootBinPath/$__build_arch.$__configuration/Native"
68+
__IntermediatesDir="$__baseIntermediateOutputPath/Native/$__build_arch.$__configuration"
69+
__BinDir="$__rootBinPath/Native/$__build_arch.$__configuration"
7070

7171
mkdir -p "$__BinDir"
7272
mkdir -p "$__IntermediatesDir"
7373

74+
export __IntermediatesDir=$__IntermediatesDir
75+
7476
# Set up the environment to be used for building with clang.
7577
if command -v "clang-3.5" > /dev/null 2>&1; then
7678
export CC="$(command -v clang-3.5)"

src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111

1212
<ItemGroup>
1313
<ModelFiles Include="$(ModelPlacementDir)\AlexNetPrepOnnx\AlexNetPreprocess.onnx"
14-
Url="https://aka.ms/mlnet-resources/image/AlexNetPrepOnnx/AlexNetPreprocess.onnx "
14+
Url="https://aka.ms/mlnet-resources/image/AlexNetPrepOnnx/AlexNetPreprocess.onnx"
1515
DestinationFile="$(ModelPlacementDir)\AlexNetPrepOnnx\AlexNetPreprocess.onnx"
1616
DestinationDir="$(ModelPlacementDir)\AlexNetPrepOnnx" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
2020
<ModelFiles Include="$(ModelPlacementDir)\ResNetPrepOnnx\ResNetPreprocess.onnx"
21-
Url="https://aka.ms/mlnet-resources/image/ResNetPrepOnnx/ResNetPreprocess.onnx "
21+
Url="https://aka.ms/mlnet-resources/image/ResNetPrepOnnx/ResNetPreprocess.onnx"
2222
DestinationFile="$(ModelPlacementDir)\ResNetPrepOnnx\ResNetPreprocess.onnx"
2323
DestinationDir="$(ModelPlacementDir)\ResNetPrepOnnx" />
2424
</ItemGroup>

0 commit comments

Comments
 (0)