Change auto contiguous to always insert contiguous #2038
Closed
+108
−51
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This build is not recommended to merge 🔴 |
🔴distilgpt2_fp16: FAILED: MIGraphX is not within tolerance - check verbose output |
pfultz2
reviewed
Aug 7, 2023
src/auto_contiguous.cpp
Outdated
| if(not ins->module_inputs().empty()) | ||
| m.replace_instruction(ins, ins->get_operator(), new_args, ins->module_inputs()); | ||
| else | ||
| m.replace_instruction(ins, ins->get_operator(), new_args); |
There was a problem hiding this comment.
You shouldn't replace the input arguments as that can cause multiple contiguous operators to be inserted when its used in multiple places. This should just do:
if(contains({"layout", "contigous"}, ins->name()))
continue;
// for last instruction that is NOT a return
if(ins->outputs().empty() and ins != last)
continue;
shape s = ins->get_shape();
if(s.dynamic())
continue;
if(s.type() == shape::tuple_type)
continue;
if(s.standard() and ins->name() == "@literal")
continue;
auto c = m.insert_instruction(std::next(ins), make_op("contiguous"), ins);
m.replace_instruction(ins, c);
pfultz2
reviewed
Aug 7, 2023
src/auto_contiguous.cpp
Outdated
| return in; | ||
| } | ||
| return m.insert_instruction(ins, make_op("contiguous"), in); | ||
| }); |
There was a problem hiding this comment.
We should still have this until reshape copy is implemented.
pfultz2
reviewed
Aug 11, 2023
src/auto_contiguous.cpp
Outdated
| @@ -59,17 +60,24 @@ void auto_contiguous::apply(module& m) const | |||
| auto last = std::prev(m.end()); | |||
| for(auto ins : iterator_for(m)) | |||
| { | |||
| if(ins->name() == "layout") | |||
| if(contains({"layout", "contiguous", "@return", "@param", "@outline"}, ins->name())) | |||
There was a problem hiding this comment.
We shouldn't be skipping @param, is there a test that fails for that?
I dont think @outline is used anywhere.
pfultz2
reviewed
Aug 11, 2023
src/eliminate_contiguous.cpp
Outdated
| @@ -161,6 +162,18 @@ static void remove_contiguous(const std::string& op_name, module& m, F f) | |||
| } | |||
| } | |||
|
|
|||
| static void remove_contiguous_noops(const std::string& op_name, module& m) | |||
There was a problem hiding this comment.
I would spell it nop with one o.
pfultz2
reviewed
Aug 11, 2023
test/auto_contiguous_test.cpp
Outdated
| auto r = m2.add_instruction(migraphx::make_op("reshape", {{"dims", {2, 1, 12, 5}}}), ca); | ||
| m2.add_return({r}); | ||
| // extra contiguous coming from reshape logic which has "requires_std_shape" attribute | ||
| auto cb = m2.add_instruction(migraphx::make_op("contiguous"), ca); |
There was a problem hiding this comment.
We shouldnt have two contiguous. Maybe we should check that the outputs are all contiguous operators before inserting it in.
pfultz2
reviewed
Aug 11, 2023
| continue; | ||
| if(s.standard() and ins->name() == "@literal") | ||
| continue; | ||
| if(s.scalar() and not contains(ins->name(), "broadcast")) |
There was a problem hiding this comment.
I would think this would be if(s.scalar() and s.standard()).
Merged
… perform jit compilation
… modes into a separate header
…' into scatter_elements_reduction_modes
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## develop #2038 +/- ##
===========================================
- Coverage 91.43% 91.30% -0.14%
===========================================
Files 461 461
Lines 17419 17451 +32
===========================================
+ Hits 15927 15933 +6
- Misses 1492 1518 +26 ☔ View full report in Codecov by Sentry. |
|
Why close this out? Guessing rebase and push forward or not needed anymore? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.