Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
vision
Commits
812395ca
Unverified
Commit
812395ca
authored
Jul 13, 2020
by
guyang3532
Committed by
GitHub
Jul 13, 2020
Browse files
Fix CPU unit tests (#2465)
parent
ad0553c0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
.circleci/unittest/linux/scripts/install.sh
.circleci/unittest/linux/scripts/install.sh
+7
-1
.circleci/unittest/windows/scripts/install.sh
.circleci/unittest/windows/scripts/install.sh
+7
-1
No files found.
.circleci/unittest/linux/scripts/install.sh
View file @
812395ca
...
@@ -10,9 +10,15 @@ set -e
...
@@ -10,9 +10,15 @@ set -e
eval
"
$(
./conda/bin/conda shell.bash hook
)
"
eval
"
$(
./conda/bin/conda shell.bash hook
)
"
conda activate ./env
conda activate ./env
if
[
-z
"
${
CU
DA
_VERSION
:-}
"
]
;
then
if
[
"
${
CU_VERSION
:-}
"
==
cpu
]
;
then
cudatoolkit
=
"cpuonly"
cudatoolkit
=
"cpuonly"
else
else
if
[[
${#
CU_VERSION
}
-eq
4
]]
;
then
CUDA_VERSION
=
"
${
CU_VERSION
:2:1
}
.
${
CU_VERSION
:3:1
}
"
elif
[[
${#
CU_VERSION
}
-eq
5
]]
;
then
CUDA_VERSION
=
"
${
CU_VERSION
:2:2
}
.
${
CU_VERSION
:4:1
}
"
fi
echo
"Using CUDA
$CUDA_VERSION
as determined by CU_VERSION"
version
=
"
$(
python
-c
"print('.'.join(
\"
${
CUDA_VERSION
}
\"
.split('.')[:2]))"
)
"
version
=
"
$(
python
-c
"print('.'.join(
\"
${
CUDA_VERSION
}
\"
.split('.')[:2]))"
)
"
cudatoolkit
=
"cudatoolkit=
${
version
}
"
cudatoolkit
=
"cudatoolkit=
${
version
}
"
fi
fi
...
...
.circleci/unittest/windows/scripts/install.sh
View file @
812395ca
...
@@ -12,9 +12,15 @@ this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
...
@@ -12,9 +12,15 @@ this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
eval
"
$(
./conda/Scripts/conda.exe
'shell.bash'
'hook'
)
"
eval
"
$(
./conda/Scripts/conda.exe
'shell.bash'
'hook'
)
"
conda activate ./env
conda activate ./env
if
[
-z
"
${
CU
DA
_VERSION
:-}
"
]
;
then
if
[
"
${
CU_VERSION
:-}
"
==
cpu
]
;
then
cudatoolkit
=
"cpuonly"
cudatoolkit
=
"cpuonly"
else
else
if
[[
${#
CU_VERSION
}
-eq
4
]]
;
then
CUDA_VERSION
=
"
${
CU_VERSION
:2:1
}
.
${
CU_VERSION
:3:1
}
"
elif
[[
${#
CU_VERSION
}
-eq
5
]]
;
then
CUDA_VERSION
=
"
${
CU_VERSION
:2:2
}
.
${
CU_VERSION
:4:1
}
"
fi
echo
"Using CUDA
$CUDA_VERSION
as determined by CU_VERSION"
version
=
"
$(
python
-c
"print('.'.join(
\"
${
CUDA_VERSION
}
\"
.split('.')[:2]))"
)
"
version
=
"
$(
python
-c
"print('.'.join(
\"
${
CUDA_VERSION
}
\"
.split('.')[:2]))"
)
"
cudatoolkit
=
"cudatoolkit=
${
version
}
"
cudatoolkit
=
"cudatoolkit=
${
version
}
"
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment