This commit is contained in:
Eldar Akchurin 2016-05-19 11:28:23 +02:00
Родитель ae0eb49d96
Коммит 80e8d73bcf
5 изменённых файлов: 102 добавлений и 1 удалений

Просмотреть файл

@ -33,6 +33,13 @@ public:
virtual void Destroy() override
{
// Make sure there are no outstanding reads.
if (m_prefetchTask.valid())
{
// If there are some, give them time to finish.
m_prefetchTask.wait_for(std::chrono::seconds(5));
}
delete this;
}

Просмотреть файл

@ -0,0 +1,25 @@
RootDir = .
DataDir = $RootDir$
# deviceId = -1 for CPU, >= 0 for GPU devices
deviceId = -1
frameMode = false
precision = "float"
Simple_Test = [
action = "write"
reader = [
readerType = "ExperimentalHTKMLFReader"
readMethod = "none"
miniBatchMode = "partial"
verbosity = 0
features = [
dim = 363
type = "real"
scpFile = "$DataDir$/glob_0000.scp"
]
]
]

Просмотреть файл

@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop3)
testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop3_Output.txt",
"Simple_Test",
"reader",
5,
randomizeAuto,/* epoch size - all available */
250,
2,
1,
@ -560,6 +560,24 @@ BOOST_AUTO_TEST_CASE(ExperimentalHTKMLFReaderSimpleDataLoop20)
1);
};
BOOST_AUTO_TEST_CASE(ExperimentalHTKMLFReaderSimpleDataLoop3)
{
HelperRunReaderTest<float>(
testDataPath() + "/Config/ExperimentalHTKMLFReaderSimpleDataLoop3_Config.cntk",
testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop3_13_Control.txt",
testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop3_Output.txt",
"Simple_Test",
"reader",
randomizeAuto,/* epoch size - all available */
1,
2,
1,
0,
0,
1);
};
BOOST_AUTO_TEST_SUITE_END()

Просмотреть файл

@ -219,6 +219,18 @@
<None Include="Config\CNTKTextFormatReader\dense.cntk" />
<None Include="Config\CNTKTextFormatReader\edge_cases.cntk" />
<None Include="Config\CNTKTextFormatReader\sparse.cntk" />
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop10_Config.cntk" />
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop11_Config.cntk" />
<None Include="Config\ExperimentalHTKMLFReaderSimpleDataLoop14_Config.cntk" />
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop19_Config.cntk" />
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop1_Config.cntk" />
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop20_Config.cntk" />
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop21_Config.cntk" />
<None Include="Config\ExperimentalHTKMLFReaderSimpleDataLoop3_Config.cntk" />
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop4_Config.cntk" />
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop5_Config.cntk" />
<None Include="Config\ExperimentalHTKMLFReaderSimpleDataLoop8_Config.cntk" />
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop9_Config.cntk" />
<None Include="Config\ImageReaderBadLabel_Config.cntk" />
<None Include="Config\ImageReaderBadMap_Config.cntk" />
<None Include="Config\ImageReaderColorTransform_Config.cntk" />

Просмотреть файл

@ -49,6 +49,9 @@
<Filter Include="Linked Source">
<UniqueIdentifier>{1a107324-82f9-49cc-a77d-a8591b21aebb}</UniqueIdentifier>
</Filter>
<Filter Include="Config\ExperimentalHTKMLF">
<UniqueIdentifier>{b2a5f515-1b00-4f19-bd19-8e3fd7eb6872}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="Data\ImageReaderSimple_map.txt">
@ -364,6 +367,42 @@
<None Include="Config\ImageReaderIntensityTransform_Config.cntk">
<Filter>Config</Filter>
</None>
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop1_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
<None Include="Config\ExperimentalHTKMLFReaderSimpleDataLoop3_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop4_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop5_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
<None Include="Config\ExperimentalHTKMLFReaderSimpleDataLoop8_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop9_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop10_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop11_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
<None Include="Config\ExperimentalHTKMLFReaderSimpleDataLoop14_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop19_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop20_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
<None Include="Config\ExperimentalHtkmlfReaderSimpleDataLoop21_Config.cntk">
<Filter>Config\ExperimentalHTKMLF</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Xml Include="Data\ImageNet1K_intensity.xml">