Removes incompatible model tests
This commit is contained in:
Gaizka Navarro
Родитель
314ce6bcf5
Коммит
dc4f53bff1
18
CNTK.sln
18
CNTK.sln
|
|
@ -866,22 +866,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Model1", "Model1", "{48C2A9
|
|||
Tests\EndToEndTests\ModelExport\Model1\testcases.yml = Tests\EndToEndTests\ModelExport\Model1\testcases.yml
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Model2", "Model2", "{82E4A6BC-BAA5-4991-B7A7-19EF6F561133}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
Tests\EndToEndTests\ModelExport\Model2\2.cntk = Tests\EndToEndTests\ModelExport\Model2\2.cntk
|
||||
Tests\EndToEndTests\ModelExport\Model2\baseline.txt = Tests\EndToEndTests\ModelExport\Model2\baseline.txt
|
||||
Tests\EndToEndTests\ModelExport\Model2\run-test = Tests\EndToEndTests\ModelExport\Model2\run-test
|
||||
Tests\EndToEndTests\ModelExport\Model2\testcases.yml = Tests\EndToEndTests\ModelExport\Model2\testcases.yml
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Model3", "Model3", "{E7860D1F-856F-46C5-A856-6390F931F976}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
Tests\EndToEndTests\ModelExport\Model3\3.cntk = Tests\EndToEndTests\ModelExport\Model3\3.cntk
|
||||
Tests\EndToEndTests\ModelExport\Model3\baseline.txt = Tests\EndToEndTests\ModelExport\Model3\baseline.txt
|
||||
Tests\EndToEndTests\ModelExport\Model3\run-test = Tests\EndToEndTests\ModelExport\Model3\run-test
|
||||
Tests\EndToEndTests\ModelExport\Model3\testcases.yml = Tests\EndToEndTests\ModelExport\Model3\testcases.yml
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AlexNet", "AlexNet", "{2B1046A1-0140-43B7-B3DC-CF7DEEE1009E}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
Tests\EndToEndTests\Image\AlexNet\add_top5_layer.mel = Tests\EndToEndTests\Image\AlexNet\add_top5_layer.mel
|
||||
|
|
@ -1221,8 +1205,6 @@ Global
|
|||
{08A05A9A-4E45-42D5-83FA-719E99C04A30} = {6E565B48-1923-49CE-9787-9BBB9D96F4C5}
|
||||
{715C0E2D-6FF6-4B26-9E49-1C68920CFAF6} = {08A05A9A-4E45-42D5-83FA-719E99C04A30}
|
||||
{48C2A9DE-FB2C-4724-9ADC-744216D79BCF} = {08A05A9A-4E45-42D5-83FA-719E99C04A30}
|
||||
{82E4A6BC-BAA5-4991-B7A7-19EF6F561133} = {08A05A9A-4E45-42D5-83FA-719E99C04A30}
|
||||
{E7860D1F-856F-46C5-A856-6390F931F976} = {08A05A9A-4E45-42D5-83FA-719E99C04A30}
|
||||
{2B1046A1-0140-43B7-B3DC-CF7DEEE1009E} = {8071EF60-30F7-4A77-81AA-ADCA0E18B1E3}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
# deviceId = 0
|
||||
#imageLayout = "cudnn"
|
||||
|
||||
deviceId = -1
|
||||
imageLayout = "legacy"
|
||||
|
||||
precision = "float"
|
||||
modelPath = "2_model.cntk"
|
||||
dbnModelPath = "2_export.dbn"
|
||||
|
||||
# uncomment the following line to write logs to a file
|
||||
#stderr = "cntkSpeech.out"
|
||||
traceLevel=1
|
||||
numMBsToShowResult=500
|
||||
|
||||
command = export
|
||||
|
||||
#######################################
|
||||
# EXPORT CONFIG #
|
||||
#######################################
|
||||
|
||||
export = [
|
||||
action = "exportdbn"
|
||||
]
|
||||
]
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Post-processing network complete.
|
||||
COMPLETED
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
. $TEST_ROOT_DIR/run-test-common
|
||||
|
||||
# This test uses a private dataset which is not part of the CNTK repository itself
|
||||
# We use the dataset from an external location specified using an environment variable
|
||||
if [[ "$CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY" == "" || ! -d "$CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY" ]]; then
|
||||
echo 'This test uses external data that is not part of the CNTK repository. Environment variable CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY must be set to point to the external test data location'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$OS" == "Windows_NT" ]; then
|
||||
DataSourceDir=`cygpath -au $CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY`/ModelExport
|
||||
else
|
||||
DataSourceDir=$CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY/ModelExport
|
||||
fi
|
||||
|
||||
# Copy the test data to the test run directory
|
||||
DataDir=$TEST_RUN_DIR/TestData
|
||||
echo DataDir : $DataDir
|
||||
mkdir $DataDir
|
||||
cp -R $DataSourceDir/* $DataDir || exit $?
|
||||
|
||||
# cntkrun <CNTK config file name> <additional CNTK args>
|
||||
cntkrun 2.cntk
|
||||
ExitCode=$?
|
||||
|
||||
# Compare the exported dbn file against the base dbn
|
||||
if [ $ExitCode -eq 0 ]; then
|
||||
BaseFileName=2_base_$TEST_DEVICE.dbn
|
||||
echo $BaseFileName
|
||||
echo Comparing exported file to base file
|
||||
cmp -s $DataDir/$BaseFileName $DataDir/2_export.dbn
|
||||
CopyCode=$?
|
||||
if [ $CopyCode -ne 0 ]; then
|
||||
echo Files are different
|
||||
fi
|
||||
ExitCode=$CopyCode
|
||||
fi
|
||||
|
||||
# Delete the test data
|
||||
rm -rf $DataDir
|
||||
|
||||
exit $ExitCode
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
dataDir: .
|
||||
tags:
|
||||
# running on every BVT job in 'E' (Examples) leg
|
||||
- bvt-e ((flavor=='release') & (device=='gpu') & (os=='linux'))
|
||||
# running every Nightly job in 'E' (Examples) leg
|
||||
- nightly-e (os=='linux')
|
||||
|
||||
testCases:
|
||||
CNTK Run must be completed:
|
||||
patterns:
|
||||
- ^COMPLETED
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
# deviceId = 0
|
||||
#imageLayout = "cudnn"
|
||||
|
||||
deviceId = -1
|
||||
imageLayout = "legacy"
|
||||
|
||||
precision = "float"
|
||||
modelPath = "3_model.cntk"
|
||||
dbnModelPath = "3_export.dbn"
|
||||
|
||||
# uncomment the following line to write logs to a file
|
||||
#stderr = "cntkSpeech.out"
|
||||
traceLevel=1
|
||||
numMBsToShowResult=500
|
||||
|
||||
command = export
|
||||
|
||||
#######################################
|
||||
# EXPORT CONFIG #
|
||||
#######################################
|
||||
|
||||
export = [
|
||||
action = "exportdbn"
|
||||
]
|
||||
]
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Post-processing network complete.
|
||||
COMPLETED
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
. $TEST_ROOT_DIR/run-test-common
|
||||
|
||||
# This test uses a private dataset which is not part of the CNTK repository itself
|
||||
# We use the dataset from an external location specified using an environment variable
|
||||
if [[ "$CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY" == "" || ! -d "$CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY" ]]; then
|
||||
echo 'This test uses external data that is not part of the CNTK repository. Environment variable CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY must be set to point to the external test data location'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$OS" == "Windows_NT" ]; then
|
||||
DataSourceDir=`cygpath -au $CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY`/ModelExport
|
||||
else
|
||||
DataSourceDir=$CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY/ModelExport
|
||||
fi
|
||||
|
||||
# Copy the test data to the test run directory
|
||||
DataDir=$TEST_RUN_DIR/TestData
|
||||
echo DataDir : $DataDir
|
||||
mkdir $DataDir
|
||||
cp -R $DataSourceDir/* $DataDir || exit $?
|
||||
|
||||
# cntkrun <CNTK config file name> <additional CNTK args>
|
||||
cntkrun 3.cntk
|
||||
ExitCode=$?
|
||||
|
||||
# Compare the exported dbn file against the base dbn
|
||||
if [ $ExitCode -eq 0 ]; then
|
||||
BaseFileName=3_base_$TEST_DEVICE.dbn
|
||||
echo $BaseFileName
|
||||
echo Comparing exported file to base file
|
||||
cmp -s $DataDir/$BaseFileName $DataDir/3_export.dbn
|
||||
CopyCode=$?
|
||||
if [ $CopyCode -ne 0 ]; then
|
||||
echo Files are different
|
||||
fi
|
||||
ExitCode=$CopyCode
|
||||
fi
|
||||
|
||||
# Delete the test data
|
||||
rm -rf $DataDir
|
||||
|
||||
exit $ExitCode
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
dataDir: .
|
||||
tags:
|
||||
# running on every BVT job in 'E' (Examples) leg
|
||||
- bvt-e ((flavor=='release') & (device=='gpu') & (os=='linux'))
|
||||
# running every Nightly job in 'E' (Examples) leg
|
||||
- nightly-e (os=='linux')
|
||||
|
||||
testCases:
|
||||
CNTK Run must be completed:
|
||||
patterns:
|
||||
- ^COMPLETED
|
||||
|
||||
Загрузка…
Ссылка в новой задаче