Skip to content

Commit

Permalink
Added Utility Function
Browse files Browse the repository at this point in the history
Added Utility Function

Style Fix

Fix Typo causing build error in windows

Fix Typo causing build error in windows

Fix const issue for windows

Extract in data folder

Reposition force local

This should work

Print Path in windows for debugging

Print Path in windows for debugging

Print Path in windows for debugging

Stip components of tar

Stip components of tar

strip componenets

Relative Path

Relative Path

Relative Path

Add List Dir utility function

Print

Print again

Print again

Squash this

Update utils.hpp

Squash this

Clean Up

Added more tests
  • Loading branch information
kartikdutt18 committed May 29, 2020
1 parent 78aa733 commit 9d90a21
Show file tree
Hide file tree
Showing 23 changed files with 89 additions and 70,654 deletions.
2 changes: 2 additions & 0 deletions .ci/linux-steps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ steps:
git clone --depth 1 https://github.com/mlpack/jenkins-conf.git conf
git clone --depth 1 https://github.com/mlpack/mlpack.git
mkdir data
sudo add-apt-repository ppa:mhier/libboost-latest
sudo apt-get update
Expand Down
2 changes: 1 addition & 1 deletion .ci/macos-steps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ steps:

# Configure CMake Args for models.
- script: |
mkdir build && cd build && cmake $(CMakeArgs-models) ..
mkdir data && mkdir build && cd build && cmake $(CMakeArgs-models) ..
displayName: 'CMake for models'

# Build mlpack
Expand Down
1 change: 1 addition & 0 deletions .ci/windows-steps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ steps:

- powershell: |
mkdir build
mkdir data
cp $(Agent.ToolsDirectory)\boost_libs\*.* build\
cp $(Agent.ToolsDirectory)\OpenBLAS.0.2.14.1\lib\native\lib\x64\*.* build\
cp $(Agent.ToolsDirectory)\OpenBLAS.0.2.14.1\lib\native\bin\x64\*.* build\
Expand Down
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,6 @@ set(DIRS
utils/
dataloader/
tests/
models/
computer_vision/
)

foreach(dir ${DIRS})
Expand Down
13 changes: 0 additions & 13 deletions computer_vision/CMakeLists.txt

This file was deleted.

23 changes: 0 additions & 23 deletions computer_vision/object_classification/CMakeLists.txt

This file was deleted.

58 changes: 0 additions & 58 deletions computer_vision/object_classification/object_classification.cpp

This file was deleted.

28,001 changes: 0 additions & 28,001 deletions data/mnist_test.csv

This file was deleted.

42,001 changes: 0 additions & 42,001 deletions data/mnist_train.csv

This file was deleted.

7 changes: 4 additions & 3 deletions dataloader/dataloader_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ template<
datasetMap[dataset].endTrainingPredictionFeatures,
datasetMap[dataset].endTrainingPredictionFeatures);

LoadCSV(datasetMap[dataset].testPath, false, false, useScaler,
LoadCSV(datasetMap[dataset].testPath, false, false, ratio, useScaler,
datasetMap[dataset].dropHeader,
datasetMap[dataset].startTestingInputFeatures,
datasetMap[dataset].endTestingInputFeatures);
Expand Down Expand Up @@ -138,8 +138,9 @@ template<
scaler.Transform(dataset, dataset);
}

testFeatures = dataset.submat(WrapIndex(startInputFeatures, dataset.n_rows),
0, WrapIndex(endInputFeatures, dataset.n_rows), dataset.n_cols - 1);
testFeatures = dataset.rows(WrapIndex(startInputFeatures,dataset.n_rows),
WrapIndex(endInputFeatures, dataset.n_rows));

mlpack::Log::Info << "Testing Dataset Loaded." << std::endl;
}
}
Expand Down
8 changes: 3 additions & 5 deletions dataloader/datasets.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ struct DatasetDetails
{
// Nothing to do here.
}

};

/**
Expand All @@ -219,7 +218,6 @@ template<
class Datasets
{
public:

//! Get details of MNIST Dataset.
const static DatasetDetails<DatasetX, DatasetY> MNIST()
{
Expand All @@ -228,10 +226,10 @@ class Datasets
true,
"/datasets/mnist.tar.gz",
"./../data/mnist.tar.gz",
"9fa4efe5",
"33470ca3",
true,
"./../data/mnist_train.csv",
"./../data/mnist_test.csv");
"./../data/mnist-dataset/mnist_train.csv",
"./../data/mnist-dataset/mnist_test.csv");

// Set the Pre-Processor Function.
mnistDetails.PreProcess = PreProcessor<DatasetX, DatasetY>::MNIST;
Expand Down
15 changes: 0 additions & 15 deletions models/CMakeLists.txt

This file was deleted.

16 changes: 0 additions & 16 deletions models/lenet/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 9d90a21

Please sign in to comment.