-
Notifications
You must be signed in to change notification settings - Fork 27
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.
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
Update to new protobuf and removed workaround for hparams encoding #135
Open
JamieMair
wants to merge
10
commits into
JuliaLogging:master
Choose a base branch
from
JamieMair:update-to-new-protobuf
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
a961114
Updated protobuf to latest version and improve the code gen script
JamieMair 603d82b
Fixed protobuf autogen script cleaning paths
JamieMair 9f2b60b
Updated the underlying protobuf files
JamieMair 41f2cf3
Change filepath again
JamieMair c20f294
Filepath change to point at original file
JamieMair 40c9822
Removed temporary fix
JamieMair 95aa514
Updated version
JamieMair ea302f8
Changed comment to better reflect the original
JamieMair 60888eb
Updated autogenerated code to use original phrasing for origin comment
JamieMair f478df8
Updated protobuf compat version
JamieMair File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
name = "TensorBoardLogger" | ||
uuid = "899adc3e-224a-11e9-021f-63837185c80f" | ||
authors = ["Filippo Vicentini <[email protected]>"] | ||
version = "0.1.22" | ||
version = "0.1.23" | ||
|
||
[deps] | ||
CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc" | ||
|
@@ -14,7 +14,7 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" | |
[compat] | ||
FileIO = "1.2.3" | ||
ImageCore = "0.8.1, 0.9" | ||
ProtoBuf = "1.0.11" | ||
ProtoBuf = "1.0.12" | ||
Requires = "0.5, 1" | ||
StatsBase = "0.27, 0.28, 0.29, 0.30, 0.31, 0.32, 0.33, 0.34" | ||
julia = "1.6" | ||
|
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 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 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 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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# Autogenerated using ProtoBuf.jl v1.0.11 on 2023-06-19T18:18:24.780 | ||
# original file: /home/lior/.julia/dev/ProtoBuf/src/google/protobuf/wrappers.proto (proto3 syntax) | ||
# Autogenerated using ProtoBuf.jl v1.0.11 on 2023-08-09T10:18:18.634 | ||
# original file: proto/tensorboard/google/protobuf/wrappers.proto (proto3 syntax) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This censored path doesn't look quite right |
||
|
||
import ProtoBuf as PB | ||
using ProtoBuf: OneOf | ||
|
@@ -276,4 +276,4 @@ function PB._encoded_size(x::StringValue) | |
encoded_size = 0 | ||
!isempty(x.value) && (encoded_size += PB._encoded_size(x.value, 1)) | ||
return encoded_size | ||
end | ||
end |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# Autogenerated using ProtoBuf.jl v1.0.11 on 2023-06-19T18:18:24.964 | ||
# original file: /home/lior/TensorBoardLogger.jl/gen/proto/tensorboard/plugins/custom_scalar/layout.proto (proto3 syntax) | ||
# Autogenerated using ProtoBuf.jl v1.0.11 on 2023-08-09T10:18:18.779 | ||
# original file: proto/tensorboard/plugins/custom_scalar/tensorboard/layout.proto (proto3 syntax) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here it's unclear that this file came from the |
||
|
||
import ProtoBuf as PB | ||
using ProtoBuf: OneOf | ||
|
@@ -237,4 +237,4 @@ function PB._encoded_size(x::Layout) | |
x.version != zero(Int32) && (encoded_size += PB._encoded_size(x.version, 1)) | ||
!isempty(x.category) && (encoded_size += PB._encoded_size(x.category, 2)) | ||
return encoded_size | ||
end | ||
end |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,4 +2,4 @@ module tensorboard_plugin_custom_scalar | |
|
||
include("layout_pb.jl") | ||
|
||
end # module tensorboard | ||
end # module tensorboard |
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 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 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 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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,4 +4,4 @@ include("../google/google.jl") | |
|
||
include("hparams/hparams.jl") | ||
|
||
end # module tensorboard | ||
end # module tensorboard |
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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,4 +2,4 @@ module tensorboard_plugin_text | |
|
||
include("plugin_data_pb.jl") | ||
|
||
end # module tensorboard | ||
end # module tensorboard |
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 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 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 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 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 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 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 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's leave this for a separate PR. This censoring is redundant and messes up file paths.
This censoring can be done with a shell script:
>>> cat file_list | xargs -I f sed -i 's|/home/lior||g' f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Likewise the
_pb.jl
files can be restored to their previous version with the full path