Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor data_transform to allow datum, cv:Mat and Blob transformation #1070

Merged
merged 17 commits into from
Oct 4, 2014
Merged

Refactor data_transform to allow datum, cv:Mat and Blob transformation #1070

merged 17 commits into from
Oct 4, 2014

Commits on Oct 3, 2014

  1. Move data_mean into data_transformer remove datum_* from BaseData 

    Conflicts:

	src/caffe/layers/memory_data_layer.cpp
    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    7182bfb View commit details
    Browse the repository at this point in the history

  2. Fixed MemoryDataLayer to make it work with pycaffe

    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    e9c08e5 View commit details
    Browse the repository at this point in the history

  3. Initial cv::Mat transformation 

    Added cv::Mat transformation to ImageDataLayer

Conflicts:

	src/caffe/layers/image_data_layer.cpp

Added transform Datum to Blob

Conflicts:

	src/caffe/layers/base_data_layer.cpp
	src/caffe/layers/base_data_layer.cu

Added transform cv::Mat to Blob

Added transform Vector<Datum> to Blob

Conflicts:
	src/caffe/data_transformer.cpp
    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    4602439 View commit details
    Browse the repository at this point in the history

  4. Remove Datum from WindowDataLayer 

    Conflicts:

	src/caffe/layers/window_data_layer.cpp
    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    b26e0b3 View commit details
    Browse the repository at this point in the history

  5. Update description data_transformer.hpp

    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    28ee58e View commit details
    Browse the repository at this point in the history

  6. Refactor common code 

    Make lint happy

Conflicts:
	src/caffe/data_transformer.cpp
    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    d1ccbe3 View commit details
    Browse the repository at this point in the history

  7. Add flag check_size=false to convert_imageset

    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    497eb60 View commit details
    Browse the repository at this point in the history

  8. Added test_io and faster cv::Mat processing 

    Conflicts:
	src/caffe/util/io.cpp
    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    5527e89 View commit details
    Browse the repository at this point in the history

  9. Add CVMatToDatum

    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    242546f View commit details
    Browse the repository at this point in the history

  10. Add ReadImageToDatumReference to test_io

    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    408c258 View commit details
    Browse the repository at this point in the history

  11. Added more tests to test_io for CVMatToDatum

    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    0a96030 View commit details
    Browse the repository at this point in the history

  12. Added mean_value to specify mean channel substraction 

    Added example of use to models/bvlc_reference_caffenet/train_val_mean_value.prototxt
    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    a9572b1 View commit details
    Browse the repository at this point in the history

  13. Fix OSX compilation for nvcc with opencv

    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    8cd863e View commit details
    Browse the repository at this point in the history

  14. Fix calls to Rand() and test_data_layer error 

    Remove benchmarking code, fixed data_transformer doxygen docs
    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    8a6d348 View commit details
    Browse the repository at this point in the history

  15. Fixed crop error and add test_data_transformer 

    Make lint happy

Fix Name conventions
    @sguada
    sguada committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    b07a54f View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2014

  1. bundle pixel mean into CaffeNet as comments

    @shelhamer
    shelhamer committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    3115b20 View commit details
    Browse the repository at this point in the history

  2. uin8 spell check

    @shelhamer
    shelhamer committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    e8b48b4 View commit details
    Browse the repository at this point in the history