Skip to content

Commit

Permalink
Fixed deploying test config file.
Browse files Browse the repository at this point in the history 
Fixed including lib for release.

Added trace message for test (current working directory)

Fixed relative path to test files when running test in Jenkins
  • Loading branch information
@gaizkan
gaizkan committed Nov 18, 2015
1 parent ced3af3 commit 30b416d
Show file tree
Hide file tree
Showing 2 changed files with 131 additions and 114 deletions.
239 changes: 127 additions & 112 deletions Tests/UnitTests/UCIFastReaderTests/DataReaderTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,139 +7,154 @@
#include "Matrix.h"
#include "commandArgUtil.h"
#include "DataReader.h"
#include "boost/filesystem.hpp"

using namespace Microsoft::MSR::CNTK;

namespace Microsoft
{
namespace MSR
{
namespace CNTK
{
namespace Test
{
const int deviceId = 0;
const float epsilon = 0.0001f;

struct F
{
F()
namespace MSR
{
BOOST_TEST_MESSAGE("setup fixture");
}

~F()
{
BOOST_TEST_MESSAGE("teardown fixture");
}

// Helper function to write the Reader's content to a file.
// outputFile : the file stream to output to.
// dataReader : the DataReader to get minibatches from
// map : the map containing the feature and label matrices
// epochs : the number of epochs to read
// mbSize : the minibatch size
// epochSize : the epoch size
// expectedFeatureRowsCount : the expected number of rows in the feature matrix
// expectedLabelRowsCount : the expected number of rows in the label matrix
void HelperWriteReaderContentToFile(
ofstream& outputFile,
DataReader<float>& dataReader,
std::map<std::wstring, Matrix<float>*>& map,
size_t epochs,
size_t mbSize,
size_t epochSize,
size_t expectedFeatureRowsCount,
size_t expectedLabelsRowsCount)
{
Matrix<float>& features = *map.at(L"features");
Matrix<float>& labels = *map.at(L"labels");

for (int epoch = 0; epoch < epochs; epoch++)
namespace CNTK
{
dataReader.StartMinibatchLoop(mbSize, epoch, epochSize);

for (int cnt = 0; dataReader.GetMinibatch(map); cnt++)
namespace Test
{
size_t numLabelsRows = labels.GetNumRows();
size_t numLabelsCols = labels.GetNumCols();
size_t numFeaturesRows = features.GetNumRows();
size_t numFeaturesCols = features.GetNumCols();
const int deviceId = 0;
const float epsilon = 0.0001f;

BOOST_CHECK_EQUAL(expectedLabelsRowsCount, numLabelsRows);
BOOST_CHECK_EQUAL(mbSize, numLabelsCols);
BOOST_CHECK_EQUAL(expectedFeatureRowsCount, numFeaturesRows);
BOOST_CHECK_EQUAL(mbSize, numFeaturesCols);

std::unique_ptr<float[]> pFeature{ features.CopyToArray() };
std::unique_ptr<float[]> pLabel{ labels.CopyToArray() };

size_t numFeatures = numFeaturesRows * numFeaturesCols;
size_t numLabels = numLabelsRows * numLabelsCols;

for (int i = 0; i < numFeatures; i++)
struct F
{
outputFile << pFeature[i] << (i % numFeaturesRows ? "\n" : " ");
}

for (int i = 0; i < numLabels; i++)
F()
{
BOOST_TEST_MESSAGE("setup fixture");
BOOST_TEST_MESSAGE("UCIFastReaderTests --> Current working directory:");
BOOST_TEST_MESSAGE(boost::filesystem::current_path());

// Get the path to the data files
boost::filesystem::path path(boost::unit_test::framework::master_test_suite().argv[0]);
wstring parent_path = path.parent_path().c_str();
if (boost::filesystem::exists(parent_path + L"/Tests/UnitTests/")) // Jenkins or command line at enlistment
{
dataPath = path.parent_path().c_str();
dataPath += L"/Tests/UnitTests/UCIFastReaderTests/Data/";
}
}

~F()
{
BOOST_TEST_MESSAGE("teardown fixture");
}

wstring dataPath;

// Helper function to write the Reader's content to a file.
// outputFile : the file stream to output to.
// dataReader : the DataReader to get minibatches from
// map : the map containing the feature and label matrices
// epochs : the number of epochs to read
// mbSize : the minibatch size
// epochSize : the epoch size
// expectedFeatureRowsCount : the expected number of rows in the feature matrix
// expectedLabelRowsCount : the expected number of rows in the label matrix
void HelperWriteReaderContentToFile(
ofstream& outputFile,
DataReader<float>& dataReader,
std::map<std::wstring, Matrix<float>*>& map,
size_t epochs,
size_t mbSize,
size_t epochSize,
size_t expectedFeatureRowsCount,
size_t expectedLabelsRowsCount)
{
Matrix<float>& features = *map.at(L"features");
Matrix<float>& labels = *map.at(L"labels");

for (int epoch = 0; epoch < epochs; epoch++)
{
dataReader.StartMinibatchLoop(mbSize, epoch, epochSize);

for (int cnt = 0; dataReader.GetMinibatch(map); cnt++)
{
size_t numLabelsRows = labels.GetNumRows();
size_t numLabelsCols = labels.GetNumCols();
size_t numFeaturesRows = features.GetNumRows();
size_t numFeaturesCols = features.GetNumCols();

BOOST_CHECK_EQUAL(expectedLabelsRowsCount, numLabelsRows);
BOOST_CHECK_EQUAL(mbSize, numLabelsCols);
BOOST_CHECK_EQUAL(expectedFeatureRowsCount, numFeaturesRows);
BOOST_CHECK_EQUAL(mbSize, numFeaturesCols);

std::unique_ptr<float[]> pFeature{ features.CopyToArray() };
std::unique_ptr<float[]> pLabel{ labels.CopyToArray() };

size_t numFeatures = numFeaturesRows * numFeaturesCols;
size_t numLabels = numLabelsRows * numLabelsCols;

for (int i = 0; i < numFeatures; i++)
{
outputFile << pFeature[i] << (i % numFeaturesRows ? "\n" : " ");
}

for (int i = 0; i < numLabels; i++)
{
outputFile << pLabel[i] << (i % numLabelsRows ? "\n" : " ");
}
}
}
}
};

BOOST_FIXTURE_TEST_SUITE(ReaderTestSuite, F)

BOOST_AUTO_TEST_CASE(UCIFastReaderSimpleDataLoop)
{
outputFile << pLabel[i] << (i % numLabelsRows ? "\n" : " ");
}
}
}
}
};
const size_t epochSize = 500;
const size_t mbSize = 250;
const size_t epochs = 2;

BOOST_FIXTURE_TEST_SUITE(ReaderTestSuite, F)
ConfigParameters config;
std::wstring configFilePath(L"configFile=" + dataPath + L"UCIFastReaderSimpleDataLoop_Config.txt");
const std::wstring controlDataFilePath(dataPath + L"UCIFastReaderSimpleDataLoop_Control.txt");
const std::wstring testDataFilePath(dataPath + L"UCIFastReaderSimpleDataLoop_Data.txt");

BOOST_AUTO_TEST_CASE(UCIFastReaderSimpleDataLoop)
{
const size_t epochSize = 500;
const size_t mbSize = 250;
const size_t epochs = 2;

const std::string controlDataFilePath("UCIFastReaderSimpleDataLoop_Control.txt");
const std::string testDataFilePath("UCIFastReaderSimpleDataLoop_Data.txt");

ConfigParameters config;
wchar_t* arg[2] = { L"CNTK", L"configFile=UCIFastReaderSimpleDataLoop_Config.txt" };
const std::string rawConfigString = ConfigParameters::ParseCommandLine(2, arg, config);
wchar_t* arg[2] { L"CNTK", &configFilePath[0] };
const std::string rawConfigString = ConfigParameters::ParseCommandLine(2, arg, config);

config.ResolveVariables(rawConfigString);
const ConfigParameters simpleDemoConfig = config("Simple_Test");
const ConfigParameters readerConfig = simpleDemoConfig("reader");
config.ResolveVariables(rawConfigString);
const ConfigParameters simpleDemoConfig = config("Simple_Test");
const ConfigParameters readerConfig = simpleDemoConfig("reader");

DataReader<float> dataReader(readerConfig);
DataReader<float> dataReader(readerConfig);

std::map<std::wstring, Matrix<float>*> map;
Matrix<float> features;
Matrix<float> labels;
map.insert(std::pair<wstring, Matrix<float>*>(L"features", &features));
map.insert(std::pair<wstring, Matrix<float>*>(L"labels", &labels));
std::map<std::wstring, Matrix<float>*> map;
Matrix<float> features;
Matrix<float> labels;
map.insert(std::pair<wstring, Matrix<float>*>(L"features", &features));
map.insert(std::pair<wstring, Matrix<float>*>(L"labels", &labels));

// Setup output file
std::remove(testDataFilePath.c_str());
ofstream outputFile(testDataFilePath, ios::out);
// Setup output file
boost::filesystem::remove(testDataFilePath);
ofstream outputFile(testDataFilePath, ios::out);

// Perform the data reading
HelperWriteReaderContentToFile(outputFile, dataReader, map, epochs, mbSize, epochSize, 2, 2);
// Perform the data reading
HelperWriteReaderContentToFile(outputFile, dataReader, map, epochs, mbSize, epochSize, 2, 2);

outputFile.close();
outputFile.close();

std::ifstream ifstream1(controlDataFilePath);
std::ifstream ifstream2(testDataFilePath);
std::ifstream ifstream1(controlDataFilePath);
std::ifstream ifstream2(testDataFilePath);

std::istream_iterator<char> beginStream1(ifstream1);
std::istream_iterator<char> endStream1;
std::istream_iterator<char> beginStream2(ifstream2);
std::istream_iterator<char> endStream2;
std::istream_iterator<char> beginStream1(ifstream1);
std::istream_iterator<char> endStream1;
std::istream_iterator<char> beginStream2(ifstream2);
std::istream_iterator<char> endStream2;

BOOST_CHECK_EQUAL_COLLECTIONS(beginStream1, endStream1, beginStream2, endStream2);
};
BOOST_CHECK_EQUAL_COLLECTIONS(beginStream1, endStream1, beginStream2, endStream2);
};

BOOST_AUTO_TEST_SUITE_END()
}
}
}
BOOST_AUTO_TEST_SUITE_END()
}
}
}
}
6 changes: 4 additions & 2 deletions Tests/UnitTests/UCIFastReaderTests/UCIFastReaderTests.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<OptimizeReferences>
</OptimizeReferences>
<AdditionalLibraryDirectories>$(BOOST_LIB_PATH);$(OutDir)..\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>ucifastreader.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ucifastreader.lib;cntkmath.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down Expand Up @@ -142,7 +142,9 @@
</Text>
</ItemGroup>
<ItemGroup>
<None Include="Data\UCIFastReaderSimpleDataLoop_Config.txt" />
<None Include="Data\UCIFastReaderSimpleDataLoop_Config.txt">
<DeploymentContent>true</DeploymentContent>
</None>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Target Name="Build" Condition="$(HasBoost)" Outputs="$(TargetPath)" DependsOnTargets="$(BuildDependsOn)" />
Expand Down

0 comments on commit 30b416d

Please sign in to comment.