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

[Bug] [misc] Fix image I/O for channels = 1 and improve test coverage #1185

Merged
merged 13 commits into from
Jun 13, 2020
Merged

[Bug] [misc] Fix image I/O for channels = 1 and improve test coverage #1185

merged 13 commits into from
Jun 13, 2020

Conversation

archibate
Copy link
Collaborator

@Rullec Rullec mentioned this pull request Jun 8, 2020
Merged
@archibate archibate self-assigned this Jun 9, 2020
@archibate archibate requested a review from Rullec June 9, 2020 09:12
@archibate archibate removed the skip ci label Jun 9, 2020
@archibate archibate added this to the v0.6.10 milestone Jun 10, 2020
@archibate archibate requested a review from yuanming-hu June 10, 2020 15:56
yuanming-hu
yuanming-hu reviewed Jun 12, 2020
View reviewed changes
Copy link
Member

@yuanming-hu yuanming-hu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, thanks! Just a few nits.

python/build.py Outdated
Comment on lines 88 to 89
os.system('cd .. && {} -m taichi changelog --save && cat CHANGELOG.md'.format(
get_python_executable()))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, does this work on Windows?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure, I triggered [release] mode for AppVeyor to test, hope this works.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AppVeyor passes, so it should work.

tests/python/test_image_io.py Outdated Show resolved Hide resolved
tests/python/test_image_io.py Show resolved Hide resolved
tests/python/test_image_io.py Outdated Show resolved Hide resolved
tests/python/test_image_io.py Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@yuanming-hu yuanming-hu changed the title [misc] Fix image I/O not working for channels = 1 and improve test coverage [misc] Fix image I/O for channels = 1 and improve test coverage Jun 12, 2020
@codecov
Copy link

codecov bot commented Jun 12, 2020 •
edited
Loading

Codecov Report

Merging #1185 into master will increase coverage by 0.79%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1185      +/-   ##
==========================================
+ Coverage   66.81%   67.60%   +0.79%     
==========================================
  Files          35       35              
  Lines        4860     4831      -29     
  Branches      890      885       -5     
==========================================
+ Hits         3247     3266      +19     
+ Misses       1438     1389      -49     
- Partials      175      176       +1
Impacted Files Coverage Δ
python/taichi/misc/image.py 67.56% <100.00%> (+21.62%) ⬆️
python/taichi/lang/kernel.py 78.49% <0.00%> (-0.32%) ⬇️
python/taichi/lang/__init__.py 72.15% <0.00%> (+0.34%) ⬆️
python/taichi/main.py 43.53% <0.00%> (+1.73%) ⬆️
python/taichi/lang/util.py 61.58% <0.00%> (+9.75%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c61c2c4...9acc054. Read the comment docs.

@archibate archibate changed the title [misc] Fix image I/O for channels = 1 and improve test coverage [Bug] [misc] Fix image I/O for channels = 1 and improve test coverage Jun 12, 2020
@archibate archibate requested review from yuanming-hu and Rullec June 12, 2020 16:39
@Rullec
Copy link
Contributor

Rullec commented Jun 13, 2020

LGTM

@archibate archibate requested a review from k-ye June 13, 2020 14:05
yuanming-hu
yuanming-hu approved these changes Jun 13, 2020
View reviewed changes
Copy link
Member

@yuanming-hu yuanming-hu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks.

@yuanming-hu yuanming-hu merged commit 112f18e into taichi-dev:master Jun 13, 2020
yuanming-hu added a commit that referenced this pull request Jun 14, 2020
@yuanming-hu
Revert "[Bug] [misc] Fix image I/O for channels = 1 and improve test …
5b70f4f 
…coverage (#1185)"

This reverts commit 112f18e.
@yuanming-hu yuanming-hu mentioned this pull request Jun 14, 2020
Merged
yuanming-hu added a commit that referenced this pull request Jun 14, 2020
@yuanming-hu
[misc] Revert #1185
7cd9a14
@yuanming-hu
Copy link
Member

Sorry, but I had to revert this PR to make way for v0.6.10. 9acc054#diff-52c099998337f8fd12cce18030135b8aR90 crashes build bots after merging into master. Please feel free to re-open another PR for this thread. Thanks.

@archibate
Copy link
Collaborator Author

I think the only thing need to revert is python/build.py?

@FantasyVR FantasyVR mentioned this pull request Jun 14, 2020
Merged
@archibate archibate mentioned this pull request Jun 14, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuanming-hu yuanming-hu yuanming-hu approved these changes

@taichi-gardener taichi-gardener Awaiting requested review from taichi-gardener

@Rullec Rullec Awaiting requested review from Rullec

@k-ye k-ye Awaiting requested review from k-ye

Assignees

@archibate archibate

Labels
None yet
Projects
None yet
Milestone
v0.6.10
Development

Successfully merging this pull request may close these issues.
4 participants
@archibate @Rullec @yuanming-hu @taichi-gardener