Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Conversation

@zhreshold
Copy link
Member

Description

Add SequentialAug to mx.image to allow composed augmenters in sequence.

Checklist

Essentials

  • Passed code style checking (make lint)
  • Changes are complete (i.e. I finished coding on this PR)
  • For user-facing API changes, API doc string has been updated.
  • To my best knowledge, examples are either not affected by this change, or have been fixed to be compatible with this change

Comments

A simple addition to allow users to apply augmenters one by one.

@zhreshold
Copy link
Member Author

@mli @piiswrong @szha
This is urgent for gluon tutorial

@piiswrong piiswrong merged commit 69a93bc into apache:master Oct 13, 2017
cjolivier01 pushed a commit to cjolivier01/mxnet that referenced this pull request Oct 13, 2017
* add sequentialAug

* add type for castaug

* modify docs
piiswrong pushed a commit that referenced this pull request Oct 14, 2017
#8232)

* GPROF update, also include include/mxnet/*.h as sources for CLionwq

* Added FindGperftools.cmake

* Add option USE_GPERFTOOLS

* Add option USE_GPERFTOOLS

* Add option USE_GPERFTOOLS

* USE_GPERFTOOLS off by default for now

* Add Apache license to FindGperftools.cmake

* Update CMakeLists.txt

Try to use GPerftools or JEmalloc by default

* Update CMakeLists.txt

Off by default for now

* internal labeling

* gperftools and jemalloc

* gperftools and jemalloc on by default

* Fixing the Caught error (#8199)

* Temporarily disable some unit tests to fix the build (#8253)

* Temporarily disable the following unit tests that have been causing build failures:

test_rms:
This can be re-enabled once #8230 is fixed.

test_autograd_save_memory:
This can be re-enabled once #8211 is fixed.

* OMP num threads 0->1

* remove check

* Update documentation links to point to mxnet.incubator.apache.org

Update documentation links to point to mxnet.incubator.apache.org

* add export to gluon (#8212)

* add export

* fix

* add test

* fix nnvm

* fix

* ReleaseFeedback: License Files  (#8247)

* Updating license Headers

* License changes

* Sequential aug (#8243)

* add sequentialAug

* add type for castaug

* modify docs

* Basic CPU Kernel OMP selection based upon whether GPU has been used (#7854)

* Basic CPU Kernel OMP selection based upon whether GPU has been used

* lint

* Disabling the test_CSVIter for now (#7829)

* Disabling the test_CSVIter for now

This test causing random failure while running on windows.
Disabling it for now till we fix it. An git hub issue has
been created to track it.

* Update test_io.py

* Update test_io.py

* Use OMP thread count as test in Kernel, set count for Kernel loop

* lint

* removed

* Remove assert

* Adjust DefaultOMPThreadsPerWorker

* remove -1 from omp_cores

* Trigger build

* It is not clear why pylint claims that this is re-imported. It is not.  This is not changed from master branch.
Trying a different format.

* lint

* lint

* Change getter/setter naming style

* allow env override

* check environment directly, since OMP_NUM_THREADS mnay have odd formatting (i.e. 3, 2").

* CR comments

* Squashed commit of the following:

commit ec704f1
Author: Olivier <[email protected]>
Date:   Mon Sep 25 12:29:25 2017 -0700

    Fix formatting

commit 0218c49
Author: Olivier <[email protected]>
Date:   Mon Sep 25 12:21:48 2017 -0700

    Splitting unary ops

commit 9abbba1
Author: Olivier <[email protected]>
Date:   Mon Sep 25 11:38:04 2017 -0700

    split unary

* Update mxnet_predict0.cc

* Update mxnet_predict0.cc

* fix oversight with bracket

* Binary scatter working on CPU and GPU

* return unchanged

* This test case is BS. I can't even tell what's wrong on the CI build because so many errors coming from this test.

* inconsequential cleanup

* Update test_kvstore.py

* Update CMakeLists.txt

* Update CMakeLists.txt

trigger build

* force fail

* remove forced error

* test clean every make

* Test

* Copy Jenkinsfile from upstream/master to fix the build.

* logic was reversed

* Update threaded_engine.h

Trigger build

* Trigger rebuild

* Trigger build

* Trigger build

* Multiplatform docker based builds (#7792)

* Add dockerized multi-architecture build files

* Add android arm64 build

* Operators for sum(csr, axis=0) and sum(csr, axis=1) (#8174)

* Add Infer storage for sparse slice operator

* Remove unused files

* Indentation fix and add gpu test for fallback

* Change sum builtin to py_sum

* Add sum_axis(csr,axis=0)=dense and sum(csr,axis=1)=dense operator

* Documentation changes for sparse

* Add fallback unittest for keepdims and exclude

* PR review based changes
:

* Fix CHECK_NE

* Change in_stype to int

* Using const int instead of int

* Initialize mid with the start

* Generalizing

* OMP num threads 0->1

* remove check
piiswrong pushed a commit to piiswrong/mxnet that referenced this pull request Oct 14, 2017
apache#8232)

* GPROF update, also include include/mxnet/*.h as sources for CLionwq

* Added FindGperftools.cmake

* Add option USE_GPERFTOOLS

* Add option USE_GPERFTOOLS

* Add option USE_GPERFTOOLS

* USE_GPERFTOOLS off by default for now

* Add Apache license to FindGperftools.cmake

* Update CMakeLists.txt

Try to use GPerftools or JEmalloc by default

* Update CMakeLists.txt

Off by default for now

* internal labeling

* gperftools and jemalloc

* gperftools and jemalloc on by default

* Fixing the Caught error (apache#8199)

* Temporarily disable some unit tests to fix the build (apache#8253)

* Temporarily disable the following unit tests that have been causing build failures:

test_rms:
This can be re-enabled once apache#8230 is fixed.

test_autograd_save_memory:
This can be re-enabled once apache#8211 is fixed.

* OMP num threads 0->1

* remove check

* Update documentation links to point to mxnet.incubator.apache.org

Update documentation links to point to mxnet.incubator.apache.org

* add export to gluon (apache#8212)

* add export

* fix

* add test

* fix nnvm

* fix

* ReleaseFeedback: License Files  (apache#8247)

* Updating license Headers

* License changes

* Sequential aug (apache#8243)

* add sequentialAug

* add type for castaug

* modify docs

* Basic CPU Kernel OMP selection based upon whether GPU has been used (apache#7854)

* Basic CPU Kernel OMP selection based upon whether GPU has been used

* lint

* Disabling the test_CSVIter for now (apache#7829)

* Disabling the test_CSVIter for now

This test causing random failure while running on windows.
Disabling it for now till we fix it. An git hub issue has
been created to track it.

* Update test_io.py

* Update test_io.py

* Use OMP thread count as test in Kernel, set count for Kernel loop

* lint

* removed

* Remove assert

* Adjust DefaultOMPThreadsPerWorker

* remove -1 from omp_cores

* Trigger build

* It is not clear why pylint claims that this is re-imported. It is not.  This is not changed from master branch.
Trying a different format.

* lint

* lint

* Change getter/setter naming style

* allow env override

* check environment directly, since OMP_NUM_THREADS mnay have odd formatting (i.e. 3, 2").

* CR comments

* Squashed commit of the following:

commit ec704f1
Author: Olivier <[email protected]>
Date:   Mon Sep 25 12:29:25 2017 -0700

    Fix formatting

commit 0218c49
Author: Olivier <[email protected]>
Date:   Mon Sep 25 12:21:48 2017 -0700

    Splitting unary ops

commit 9abbba1
Author: Olivier <[email protected]>
Date:   Mon Sep 25 11:38:04 2017 -0700

    split unary

* Update mxnet_predict0.cc

* Update mxnet_predict0.cc

* fix oversight with bracket

* Binary scatter working on CPU and GPU

* return unchanged

* This test case is BS. I can't even tell what's wrong on the CI build because so many errors coming from this test.

* inconsequential cleanup

* Update test_kvstore.py

* Update CMakeLists.txt

* Update CMakeLists.txt

trigger build

* force fail

* remove forced error

* test clean every make

* Test

* Copy Jenkinsfile from upstream/master to fix the build.

* logic was reversed

* Update threaded_engine.h

Trigger build

* Trigger rebuild

* Trigger build

* Trigger build

* Multiplatform docker based builds (apache#7792)

* Add dockerized multi-architecture build files

* Add android arm64 build

* Operators for sum(csr, axis=0) and sum(csr, axis=1) (apache#8174)

* Add Infer storage for sparse slice operator

* Remove unused files

* Indentation fix and add gpu test for fallback

* Change sum builtin to py_sum

* Add sum_axis(csr,axis=0)=dense and sum(csr,axis=1)=dense operator

* Documentation changes for sparse

* Add fallback unittest for keepdims and exclude

* PR review based changes
:

* Fix CHECK_NE

* Change in_stype to int

* Using const int instead of int

* Initialize mid with the start

* Generalizing

* OMP num threads 0->1

* remove check
piiswrong pushed a commit that referenced this pull request Oct 14, 2017
#8232)

* GPROF update, also include include/mxnet/*.h as sources for CLionwq

* Added FindGperftools.cmake

* Add option USE_GPERFTOOLS

* Add option USE_GPERFTOOLS

* Add option USE_GPERFTOOLS

* USE_GPERFTOOLS off by default for now

* Add Apache license to FindGperftools.cmake

* Update CMakeLists.txt

Try to use GPerftools or JEmalloc by default

* Update CMakeLists.txt

Off by default for now

* internal labeling

* gperftools and jemalloc

* gperftools and jemalloc on by default

* Fixing the Caught error (#8199)

* Temporarily disable some unit tests to fix the build (#8253)

* Temporarily disable the following unit tests that have been causing build failures:

test_rms:
This can be re-enabled once #8230 is fixed.

test_autograd_save_memory:
This can be re-enabled once #8211 is fixed.

* OMP num threads 0->1

* remove check

* Update documentation links to point to mxnet.incubator.apache.org

Update documentation links to point to mxnet.incubator.apache.org

* add export to gluon (#8212)

* add export

* fix

* add test

* fix nnvm

* fix

* ReleaseFeedback: License Files  (#8247)

* Updating license Headers

* License changes

* Sequential aug (#8243)

* add sequentialAug

* add type for castaug

* modify docs

* Basic CPU Kernel OMP selection based upon whether GPU has been used (#7854)

* Basic CPU Kernel OMP selection based upon whether GPU has been used

* lint

* Disabling the test_CSVIter for now (#7829)

* Disabling the test_CSVIter for now

This test causing random failure while running on windows.
Disabling it for now till we fix it. An git hub issue has
been created to track it.

* Update test_io.py

* Update test_io.py

* Use OMP thread count as test in Kernel, set count for Kernel loop

* lint

* removed

* Remove assert

* Adjust DefaultOMPThreadsPerWorker

* remove -1 from omp_cores

* Trigger build

* It is not clear why pylint claims that this is re-imported. It is not.  This is not changed from master branch.
Trying a different format.

* lint

* lint

* Change getter/setter naming style

* allow env override

* check environment directly, since OMP_NUM_THREADS mnay have odd formatting (i.e. 3, 2").

* CR comments

* Squashed commit of the following:

commit ec704f1
Author: Olivier <[email protected]>
Date:   Mon Sep 25 12:29:25 2017 -0700

    Fix formatting

commit 0218c49
Author: Olivier <[email protected]>
Date:   Mon Sep 25 12:21:48 2017 -0700

    Splitting unary ops

commit 9abbba1
Author: Olivier <[email protected]>
Date:   Mon Sep 25 11:38:04 2017 -0700

    split unary

* Update mxnet_predict0.cc

* Update mxnet_predict0.cc

* fix oversight with bracket

* Binary scatter working on CPU and GPU

* return unchanged

* This test case is BS. I can't even tell what's wrong on the CI build because so many errors coming from this test.

* inconsequential cleanup

* Update test_kvstore.py

* Update CMakeLists.txt

* Update CMakeLists.txt

trigger build

* force fail

* remove forced error

* test clean every make

* Test

* Copy Jenkinsfile from upstream/master to fix the build.

* logic was reversed

* Update threaded_engine.h

Trigger build

* Trigger rebuild

* Trigger build

* Trigger build

* Multiplatform docker based builds (#7792)

* Add dockerized multi-architecture build files

* Add android arm64 build

* Operators for sum(csr, axis=0) and sum(csr, axis=1) (#8174)

* Add Infer storage for sparse slice operator

* Remove unused files

* Indentation fix and add gpu test for fallback

* Change sum builtin to py_sum

* Add sum_axis(csr,axis=0)=dense and sum(csr,axis=1)=dense operator

* Documentation changes for sparse

* Add fallback unittest for keepdims and exclude

* PR review based changes
:

* Fix CHECK_NE

* Change in_stype to int

* Using const int instead of int

* Initialize mid with the start

* Generalizing

* OMP num threads 0->1

* remove check
crazy-cat pushed a commit to crazy-cat/incubator-mxnet that referenced this pull request Oct 26, 2017
* add sequentialAug

* add type for castaug

* modify docs
crazy-cat pushed a commit to crazy-cat/incubator-mxnet that referenced this pull request Oct 26, 2017
apache#8232)

* GPROF update, also include include/mxnet/*.h as sources for CLionwq

* Added FindGperftools.cmake

* Add option USE_GPERFTOOLS

* Add option USE_GPERFTOOLS

* Add option USE_GPERFTOOLS

* USE_GPERFTOOLS off by default for now

* Add Apache license to FindGperftools.cmake

* Update CMakeLists.txt

Try to use GPerftools or JEmalloc by default

* Update CMakeLists.txt

Off by default for now

* internal labeling

* gperftools and jemalloc

* gperftools and jemalloc on by default

* Fixing the Caught error (apache#8199)

* Temporarily disable some unit tests to fix the build (apache#8253)

* Temporarily disable the following unit tests that have been causing build failures:

test_rms:
This can be re-enabled once apache#8230 is fixed.

test_autograd_save_memory:
This can be re-enabled once apache#8211 is fixed.

* OMP num threads 0->1

* remove check

* Update documentation links to point to mxnet.incubator.apache.org

Update documentation links to point to mxnet.incubator.apache.org

* add export to gluon (apache#8212)

* add export

* fix

* add test

* fix nnvm

* fix

* ReleaseFeedback: License Files  (apache#8247)

* Updating license Headers

* License changes

* Sequential aug (apache#8243)

* add sequentialAug

* add type for castaug

* modify docs

* Basic CPU Kernel OMP selection based upon whether GPU has been used (apache#7854)

* Basic CPU Kernel OMP selection based upon whether GPU has been used

* lint

* Disabling the test_CSVIter for now (apache#7829)

* Disabling the test_CSVIter for now

This test causing random failure while running on windows.
Disabling it for now till we fix it. An git hub issue has
been created to track it.

* Update test_io.py

* Update test_io.py

* Use OMP thread count as test in Kernel, set count for Kernel loop

* lint

* removed

* Remove assert

* Adjust DefaultOMPThreadsPerWorker

* remove -1 from omp_cores

* Trigger build

* It is not clear why pylint claims that this is re-imported. It is not.  This is not changed from master branch.
Trying a different format.

* lint

* lint

* Change getter/setter naming style

* allow env override

* check environment directly, since OMP_NUM_THREADS mnay have odd formatting (i.e. 3, 2").

* CR comments

* Squashed commit of the following:

commit ec704f1
Author: Olivier <[email protected]>
Date:   Mon Sep 25 12:29:25 2017 -0700

    Fix formatting

commit 0218c49
Author: Olivier <[email protected]>
Date:   Mon Sep 25 12:21:48 2017 -0700

    Splitting unary ops

commit 9abbba1
Author: Olivier <[email protected]>
Date:   Mon Sep 25 11:38:04 2017 -0700

    split unary

* Update mxnet_predict0.cc

* Update mxnet_predict0.cc

* fix oversight with bracket

* Binary scatter working on CPU and GPU

* return unchanged

* This test case is BS. I can't even tell what's wrong on the CI build because so many errors coming from this test.

* inconsequential cleanup

* Update test_kvstore.py

* Update CMakeLists.txt

* Update CMakeLists.txt

trigger build

* force fail

* remove forced error

* test clean every make

* Test

* Copy Jenkinsfile from upstream/master to fix the build.

* logic was reversed

* Update threaded_engine.h

Trigger build

* Trigger rebuild

* Trigger build

* Trigger build

* Multiplatform docker based builds (apache#7792)

* Add dockerized multi-architecture build files

* Add android arm64 build

* Operators for sum(csr, axis=0) and sum(csr, axis=1) (apache#8174)

* Add Infer storage for sparse slice operator

* Remove unused files

* Indentation fix and add gpu test for fallback

* Change sum builtin to py_sum

* Add sum_axis(csr,axis=0)=dense and sum(csr,axis=1)=dense operator

* Documentation changes for sparse

* Add fallback unittest for keepdims and exclude

* PR review based changes
:

* Fix CHECK_NE

* Change in_stype to int

* Using const int instead of int

* Initialize mid with the start

* Generalizing

* OMP num threads 0->1

* remove check
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants