merge 1.9.x into master and reapply reverted 1.9.x changes #5712
Conversation
make timeout for rasa shell configurable
Co-Authored-By: Akela Drissner-Schmid <32450038+akelad@users.noreply.github.com>
Revert "Move activation to transformer block"
add whatsapp+ prefix to twilio creds
Revert model breaking changes in 1.9.x
prepared release of version 1.9.7
Co-Authored-By: Tanja <tabergma@gmail.com>
erohmensing
changed the title
| if self.config[NUM_TRANSFORMER_LAYERS] > 0: | ||
| # apply activation | ||
| outputs = tfa.activations.gelu(outputs) | ||
|
|
There was a problem hiding this comment.
We need to keep this if we want to reapply the changes again.
There was a problem hiding this comment.
Thanks, I thought so. Not sure what went wrong, i'll try again.
There was a problem hiding this comment.
Wait sorry i should clarify -- this PR was supposed to already reapply the changes. Is it possible that the activation PR wasn't ever merged into master (but genie's were)?
There was a problem hiding this comment.
Would be strange... but maybe there were some merge conflicts and someone did not resolve them properly...
Just checked master. The changes over there are correct.
There was a problem hiding this comment.
Okay. I've tried a few different things with the commits and haven't gotten it to play nice. 5565 is correct on master and no diff, and the right side here looks correct (even if the diff doesn't correctly reflect master). What if we merge, then check master to make sure everything is how we expect? I think the end result of this PR is correct...
There was a problem hiding this comment.
it may make more sense for you to take over this merge/re-apply since i don't know intuitively which changes are supposed to go where 😬
There was a problem hiding this comment.
Yeah, sorry. We first moved it but then decided to keep it where it was and wrap it with an if statement.
There was a problem hiding this comment.
ok let's definitely rename that pr 🙈 i think i missed a few commits, let me try
There was a problem hiding this comment.
Updated everything. Looks good now I would say.
There was a problem hiding this comment.
Great, thank you! I think i just missed 2 of your commits which made stuff weird. renamed the PR.
Proposed changes:
it ended up being easier to do both in the same PR, as we'd just have to resolve the conflicts and then re-resolve them if we did them in 2.
Status (please check what you already did):
black(please check Readme for instructions)