Skip to content
This repository has been archived by the owner on Nov 3, 2022. It is now read-only.

Add Parametric Tan Hyperbolic Linear Unit Activation #313

Open
wants to merge 27 commits into
base: master
Choose a base branch
from

Conversation

DaniyarM
Copy link

@DaniyarM DaniyarM commented Oct 10, 2018

Added new activation that improves the convergence and accuracy of some models.

[1] Parametric Tan Hyperbolic Linear Unit Activation for Deep Neural Networks

Related Issues
(None)

PR Overview

[ y ] This PR requires new unit tests [y/n] (make sure tests are included)
[ y ] This PR requires to update the documentation [y/n] (make sure the docs are up-to-date)
[ y ] This PR is backwards compatible [y/n]
[ n ] This PR changes the current API [y/n] (all API changes need to be approved by fchollet)

@gabrieldemarmiesse
Copy link
Contributor

Hello, could you resolve the conflicts? Then I'll review.

@DaniyarM
Copy link
Author

Hello, could you resolve the conflicts? Then I'll review.

Hello, could you please clarify the reason for the new conflicts? I do not see the differences...

@DaniyarM
Copy link
Author

DaniyarM commented Feb 9, 2019

@gabrieldemarmiesse I resolved all conflicts. It seems only problems with encoding remain. Just resolve its towards master brunch please.

@gabrieldemarmiesse
Copy link
Contributor

Github is still saying "this branch has conflicts that must be resolved".

@DaniyarM
Copy link
Author

DaniyarM commented Feb 9, 2019

@gabrieldemarmiesse You have no permissions to resolve in direction of master tree?
As I see it just text encodind issue.

@gabrieldemarmiesse
Copy link
Contributor

Reviewers should not modify pull requests directly, otherwise, they're not reviewer, they're authors ;) Generally though, in the OSS world, it's the job of the person submitting the pull request to resolve conflicts.

@DaniyarM
Copy link
Author

DaniyarM commented Feb 9, 2019

@gabrieldemarmiesse Then please clarify how can I resolve it. Do I need change encoding through notepad++? Which one I need? We have problems only with that files that strange...

Update encoding
@DaniyarM
Copy link
Author

DaniyarM commented Feb 9, 2019

@gabrieldemarmiesse I'm really can't understand this. May be bug with git. I check encoding of contrib_docs/structure.py as example and it exactly the same as in master brunch. What is this conflict about?

@DaniyarM
Copy link
Author

DaniyarM commented Feb 9, 2019

@gabrieldemarmiesse I found a way to do all in web, so no more issues whatever they are :) Please review.

@gabrieldemarmiesse
Copy link
Contributor

It seems some visual studio files were added. Could you remove them?

@DaniyarM
Copy link
Author

DaniyarM commented Feb 9, 2019

@gabrieldemarmiesse Done

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.

None yet

2 participants