Skip to content

Update version.py#2

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

Closed
dhruvesh09 wants to merge 14 commits into from
Closed

Update version.py #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f21b8d1
Prepare for 0.24.0.dev Release
tfx-copybara Aug 11, 2020
2feb8e3
Minor refactor.
tfx-copybara Aug 13, 2020
52e424e
Add support for converting prensor to `StructuredTensor`.
andylou2 Aug 18, 2020
218ef17
Switched to using the py3.8 docker image to build s2t.
brills Aug 18, 2020
b68b690
Drop py2 support.
andylou2 Aug 25, 2020
4a422bf
Deprecated Py3.5 support and adding kokoro jobs py3.8
tfx-copybara Aug 26, 2020
aab8be8
remove six from prensor.py
andylou2 Sep 8, 2020
0e5e2bf
no-op.
andylou2 Sep 9, 2020
74ee9bc
Update code to python 3 style guide.
andylou2 Sep 10, 2020
b1b9cff
add code block to documentation
andylou2 Sep 14, 2020
37870fc
Prepares struct2tensor 0.24.0 release.
tfx-copybara Sep 14, 2020
52e2696
Update version.py
dhruvesh09 Oct 26, 2020
b8c445b
Merge branch 'r0.24.0' into r0.23.0
dhruvesh09 Oct 26, 2020
69ef5f9
Update RELEASE.md
dhruvesh09 Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ through Google's colab environment, or [download the
file](examples/prensor_playground.ipynb) to run it in your own Jupyter
environment.


There are two main use cases of this repo:

1. To create a PIP package. The PIP package contains plug-ins (OpKernels) to an
Expand Down
19 changes: 19 additions & 0 deletions RELEASE.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
# `struct2tensor` release notes

## Release 0.24.0

## Major Features and Improvements

* Add support for converting prensor to `StructuredTensor`.

## Bug Fixes and Other Changes

* Depends on `tensorflow>=2.3.0,<2.4`
* Depends on `tensorflow-metadata>=0.24,<0.25`ghfcch

## Breaking changes

* N/A

## Deprecations

* Deprecated py3.5 support

## Release 0.23.0

### Major Features and Improvements
Expand Down
7 changes: 2 additions & 5 deletions setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,6 @@
# limitations under the License.
# ==============================================================================
"""Setup for pip package."""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from setuptools import find_packages
from setuptools import setup
Expand DownExpand Up@@ -63,7 +60,7 @@ def has_ext_modules(self):
install_requires=[
'protobuf>=3.8.0,<4',
'tensorflow>=2.3.0,<2.4',
'tensorflow_metadata>=0.23,<0.24',
'tensorflow_metadata>=0.24,<0.25',
'pyarrow>=0.15,<1',
],
# Add in any packaged data.
Expand All@@ -81,9 +78,9 @@ def has_ext_modules(self):
'Operating System :: MacOS :: MacOS X',
'Operating System :: POSIX :: Linux',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3 :: Only',
'Topic :: Scientific/Engineering',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
Expand Down
31 changes: 22 additions & 9 deletions struct2tensor/BUILD
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ s2t_pytype_library(
srcs = [
"__init__.py",
],
srcs_version = "PY2AND3",
srcs_version = "PY3ONLY",
deps = [
":calculate_options",
":expression",
Expand All@@ -60,7 +60,7 @@ s2t_pytype_library(
srcs = [
"path.py",
],
srcs_version = "PY2AND3",
srcs_version = "PY3ONLY",
deps = ["@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:metadata_v0_proto_py_pb2"],
)

Expand All@@ -73,7 +73,7 @@ s2t_pytype_library(
"prensor_util.py",
"prensor_value.py",
],
srcs_version = "PY2AND3",
srcs_version = "PY3ONLY",
deps = [
":calculate_options",
":path",
Expand All@@ -90,7 +90,7 @@ s2t_pytype_library(
srcs = [
"calculate_options.py",
],
srcs_version = "PY2AND3",
srcs_version = "PY3ONLY",
)

# Note: do not separate these, as eventually we want to make sure that they
Expand DownExpand Up@@ -119,7 +119,7 @@ s2t_pytype_library(
"expression_impl/size.py",
"expression_impl/slice_expression.py",
],
srcs_version = "PY2AND3",
srcs_version = "PY3ONLY",
deps = [
":calculate_options",
":path",
Expand All@@ -136,7 +136,7 @@ s2t_pytype_library(
srcs = [
"expression_impl/map_prensor_to_prensor.py",
],
srcs_version = "PY2AND3",
srcs_version = "PY3ONLY",
deps = [
":expression",
":path",
Expand All@@ -149,7 +149,7 @@ s2t_pytype_library(
srcs = [
"expression_impl/placeholder.py",
],
srcs_version = "PY2AND3",
srcs_version = "PY3ONLY",
deps = [
":expression",
":map_prensor_to_prensor",
Expand All@@ -163,6 +163,7 @@ s2t_pytype_library(
srcs = [
"expression_impl/parquet.py",
],
srcs_version = "PY3ONLY",
deps = [
":expression",
":map_prensor_to_prensor",
Expand All@@ -179,20 +180,32 @@ s2t_pytype_library(
srcs = [
"expression_impl/proto_test_util.py",
],
srcs_version = "PY2AND3",
srcs_version = "PY3ONLY",
deps = [
":expression",
"//struct2tensor/test:test_py_pb2",
"@com_google_protobuf//:protobuf_python",
],
)

s2t_pytype_library(
name = "prensor_to_structured_tensor",
srcs = [
"prensor_to_structured_tensor.py",
],
srcs_version = "PY3ONLY",
deps = [
":path",
":prensor",
],
)

s2t_pytype_library(
name = "structured_tensor_to_prensor",
srcs = [
"structured_tensor_to_prensor.py",
],
srcs_version = "PY2AND3",
srcs_version = "PY3ONLY",
deps = [
":path",
":prensor",
Expand Down
11 changes: 4 additions & 7 deletions struct2tensor/calculate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,14 @@
calculation.

"""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

# type(id(...)), disambiguated for clarity
IDExpression = int
Expand DownExpand Up@@ -252,7 +249,7 @@ def __eq__(self, node: "_ExpressionNode") -> bool:
# as opposed to semantic equality.
return all([a is b for a, b in zip(self.sources, node.sources)])

def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
def __str__(self) -> str:
return ("expression: {expression} sources: {sources} destinations: "
"{destinations} value: {value}").format(
expression=str(self.expression),
Expand DownExpand Up@@ -378,7 +375,7 @@ class OriginalExpressionGraph(ExpressionGraph):
"""

def __init__(self, expressions: Sequence[expression.Expression]):
super(OriginalExpressionGraph, self).__init__()
super().__init__()
self._add_expressions(expressions)
original_nodes = list(self._node.values())
self._find_destinations(original_nodes)
Expand DownExpand Up@@ -431,7 +428,7 @@ class CanonicalExpressionGraph(ExpressionGraph):
"""

def __init__(self, original: ExpressionGraph):
super(CanonicalExpressionGraph, self).__init__()
super().__init__()
# Nodes indexed by _ExpressionNode.
self._node_map = {} # type: Dict[_ExpressionNode, _ExpressionNode]
self._add_expressions([x.expression for x in original.ordered_node_list])
Expand Down
5 changes: 0 additions & 5 deletions struct2tensor/calculate_options.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,6 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function


class Options(object):
"""Options for calculate functions.
Expand Down
4 changes: 0 additions & 4 deletions struct2tensor/calculate_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.calculate."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import random

from struct2tensor import calculate
Expand Down
15 changes: 8 additions & 7 deletions struct2tensor/calculate_with_source_paths.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,28 +12,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Given an expression, calculate the prensor and source paths."""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import List, NamedTuple, Optional, Sequence, Set, Tuple

import collections
from struct2tensor import calculate
from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
from struct2tensor.expression_impl import proto
from struct2tensor.proto import query_metadata_pb2
from typing import List, Optional, Sequence, Set, Tuple
import tensorflow as tf

from google.protobuf import descriptor

# A proto summary represents the tensor of protos and descriptor, along with
# all the paths associated with it.
# tensor is tf.Tensor
# descriptor is descriptor.Descriptor
# paths is List[path.Path]
ProtoRequirements = collections.namedtuple("ProtoRequirements",
["tensor", "descriptor", "paths"]) # pylint: disable=invalid-name
ProtoRequirements = NamedTuple("ProtoRequirements",
[("tensor", tf.Tensor),
("descriptor", descriptor.Descriptor),
("paths", List[path.Path])])


def calculate_prensors_with_source_paths(
Expand Down
4 changes: 0 additions & 4 deletions struct2tensor/calculate_with_source_paths_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for calculate_with_source_paths."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import calculate_with_source_paths
from struct2tensor import path
Expand Down
10 changes: 3 additions & 7 deletions struct2tensor/create_expression.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,17 +17,13 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import FrozenSet, Mapping, Optional, Sequence

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import FrozenSet, Mapping, Optional, Sequence


class _DirectExpression(expression.Expression):
Expand All@@ -47,7 +43,7 @@ def __init__(self, is_repeated: bool, my_type: Optional[tf.DType],
value: the return value of calculate(...)
children: the subexpressions.
"""
super(_DirectExpression, self).__init__(is_repeated, my_type)
super().__init__(is_repeated, my_type)
self._value = value
self._children = children

Expand DownExpand Up@@ -75,7 +71,7 @@ def _get_child_impl(self,
def known_field_names(self) -> FrozenSet[path.Step]:
return frozenset(self._children.keys())

def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
def __str__(self) -> str:
return "_DirectExpression: {}".format(str(id(self)))


Expand Down
4 changes: 0 additions & 4 deletions struct2tensor/create_expression_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.create_expression."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import create_expression
from struct2tensor import path
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Update version.py by dhruvesh09 · Pull Request #2 · google/struct2tensor · GitHub
Skip to content
Update version.py#2

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

 Closed

dhruvesh09
wants to merge
14
commits into

from

 Closed


Update version.py
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
f21b8d1

Prepare for 0.24.0.dev Release


tfx-copybara Aug 11, 2020
2feb8e3

Minor refactor.


tfx-copybara Aug 13, 2020
52e424e

Add support for converting prensor to `StructuredTensor`.


andylou2 Aug 18, 2020
218ef17

Switched to using the py3.8 docker image to build s2t.


brills Aug 18, 2020
b68b690

Drop py2 support.


andylou2 Aug 25, 2020
4a422bf

Deprecated Py3.5 support and adding kokoro jobs py3.8


tfx-copybara Aug 26, 2020
aab8be8

remove six from prensor.py


andylou2 Sep 8, 2020
0e5e2bf

no-op.


andylou2 Sep 9, 2020
74ee9bc

Update code to python 3 style guide.


andylou2 Sep 10, 2020
b1b9cff

add code block to documentation


andylou2 Sep 14, 2020
37870fc

Prepares struct2tensor 0.24.0 release.


tfx-copybara Sep 14, 2020
52e2696

Update version.py


dhruvesh09 Oct 26, 2020
b8c445b

Merge branch 'r0.24.0' into r0.23.0


dhruvesh09 Oct 26, 2020
69ef5f9

Update RELEASE.md


dhruvesh09 Oct 26, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ through Google's colab environment, or [download the
file](examples/prensor_playground.ipynb) to run it in your own Jupyter
environment.


There are two main use cases of this repo:

1. To create a PIP package. The PIP package contains plug-ins (OpKernels) to an
Expand Down

19 changes: 19 additions & 0 deletions
RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
# `struct2tensor` release notes

## Release 0.24.0

## Major Features and Improvements

* Add support for converting prensor to `StructuredTensor`.

## Bug Fixes and Other Changes

* Depends on `tensorflow>=2.3.0,<2.4`
* Depends on `tensorflow-metadata>=0.24,<0.25`ghfcch

## Breaking changes

* N/A

## Deprecations

* Deprecated py3.5 support

## Release 0.23.0

### Major Features and Improvements
Expand Down

7 changes: 2 additions & 5 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,6 @@
# limitations under the License.
# ==============================================================================
"""Setup for pip package."""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from setuptools import find_packages
from setuptools import setup
Expand DownExpand Up@@ -63,7 +60,7 @@ def has_ext_modules(self):
 install_requires=[
 'protobuf>=3.8.0,<4',
 'tensorflow>=2.3.0,<2.4',
 'tensorflow_metadata>=0.23,<0.24',
 'tensorflow_metadata>=0.24,<0.25',
 'pyarrow>=0.15,<1',
 ],
 # Add in any packaged data.
Expand All@@ -81,9 +78,9 @@ def has_ext_modules(self):
 'Operating System :: MacOS :: MacOS X',
 'Operating System :: POSIX :: Linux',
 'Programming Language :: Python',
 'Programming Language :: Python :: 3',
 'Programming Language :: Python :: 3.6',
 'Programming Language :: Python :: 3.7',
 'Programming Language :: Python :: 3.8',
 'Programming Language :: Python :: 3 :: Only',
 'Topic :: Scientific/Engineering',
 'Topic :: Scientific/Engineering :: Artificial Intelligence',
Expand Down

31 changes: 22 additions & 9 deletions
struct2tensor/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ s2t_pytype_library(
 srcs = [
 "__init__.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":expression",
Expand All@@ -60,7 +60,7 @@ s2t_pytype_library(
 srcs = [
 "path.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = ["@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:metadata_v0_proto_py_pb2"],
)

Expand All@@ -73,7 +73,7 @@ s2t_pytype_library(
 "prensor_util.py",
 "prensor_value.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -90,7 +90,7 @@ s2t_pytype_library(
 srcs = [
 "calculate_options.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
)

# Note: do not separate these, as eventually we want to make sure that they
Expand DownExpand Up@@ -119,7 +119,7 @@ s2t_pytype_library(
 "expression_impl/size.py",
 "expression_impl/slice_expression.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -136,7 +136,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/map_prensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":path",
Expand All@@ -149,7 +149,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/placeholder.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -163,6 +163,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/parquet.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -179,20 +180,32 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/proto_test_util.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 "//struct2tensor/test:test_py_pb2",
 "@com_google_protobuf//:protobuf_python",
 ],
)

s2t_pytype_library(
 name = "prensor_to_structured_tensor",
 srcs = [
 "prensor_to_structured_tensor.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
 ],
)

s2t_pytype_library(
 name = "structured_tensor_to_prensor",
 srcs = [
 "structured_tensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
Expand Down

11 changes: 4 additions & 7 deletions
struct2tensor/calculate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,14 @@
 calculation.

"""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

# type(id(...)), disambiguated for clarity
IDExpression = int
Expand DownExpand Up@@ -252,7 +249,7 @@ def __eq__(self, node: "_ExpressionNode") -> bool:
 # as opposed to semantic equality.
 return all([a is b for a, b in zip(self.sources, node.sources)])

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return ("expression: {expression} sources: {sources} destinations: "
 "{destinations} value: {value}").format(
 expression=str(self.expression),
Expand DownExpand Up@@ -378,7 +375,7 @@ class OriginalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, expressions: Sequence[expression.Expression]):
 super(OriginalExpressionGraph, self).__init__()
 super().__init__()
 self._add_expressions(expressions)
 original_nodes = list(self._node.values())
 self._find_destinations(original_nodes)
Expand DownExpand Up@@ -431,7 +428,7 @@ class CanonicalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, original: ExpressionGraph):
 super(CanonicalExpressionGraph, self).__init__()
 super().__init__()
 # Nodes indexed by _ExpressionNode.
 self._node_map = {} # type: Dict[_ExpressionNode, _ExpressionNode]
 self._add_expressions([x.expression for x in original.ordered_node_list])
Expand Down

5 changes: 0 additions & 5 deletions
struct2tensor/calculate_options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,6 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function


class Options(object):
 """Options for calculate functions.
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.calculate."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import random

from struct2tensor import calculate
Expand Down

15 changes: 8 additions & 7 deletions
struct2tensor/calculate_with_source_paths.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,28 +12,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Given an expression, calculate the prensor and source paths."""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import List, NamedTuple, Optional, Sequence, Set, Tuple

import collections
from struct2tensor import calculate
from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
from struct2tensor.expression_impl import proto
from struct2tensor.proto import query_metadata_pb2
from typing import List, Optional, Sequence, Set, Tuple
import tensorflow as tf

from google.protobuf import descriptor

# A proto summary represents the tensor of protos and descriptor, along with
# all the paths associated with it.
# tensor is tf.Tensor
# descriptor is descriptor.Descriptor
# paths is List[path.Path]
ProtoRequirements = collections.namedtuple("ProtoRequirements",
 ["tensor", "descriptor", "paths"]) # pylint: disable=invalid-name
ProtoRequirements = NamedTuple("ProtoRequirements",
 [("tensor", tf.Tensor),
 ("descriptor", descriptor.Descriptor),
 ("paths", List[path.Path])])


def calculate_prensors_with_source_paths(
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_with_source_paths_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for calculate_with_source_paths."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import calculate_with_source_paths
from struct2tensor import path
Expand Down

10 changes: 3 additions & 7 deletions
struct2tensor/create_expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,17 +17,13 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import FrozenSet, Mapping, Optional, Sequence

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import FrozenSet, Mapping, Optional, Sequence


class _DirectExpression(expression.Expression):
Expand All@@ -47,7 +43,7 @@ def __init__(self, is_repeated: bool, my_type: Optional[tf.DType],
 value: the return value of calculate(...)
 children: the subexpressions.
 """
 super(_DirectExpression, self).__init__(is_repeated, my_type)
 super().__init__(is_repeated, my_type)
 self._value = value
 self._children = children

Expand DownExpand Up@@ -75,7 +71,7 @@ def _get_child_impl(self,
 def known_field_names(self) -> FrozenSet[path.Step]:
 return frozenset(self._children.keys())

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return "_DirectExpression: {}".format(str(id(self)))


Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/create_expression_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.create_expression."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import create_expression
from struct2tensor import path
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update version.py by dhruvesh09 · Pull Request #2 · google/struct2tensor · GitHub
Skip to content
Update version.py#2

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

 Closed

dhruvesh09
wants to merge
14
commits into

from

 Closed


Update version.py
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
f21b8d1

Prepare for 0.24.0.dev Release


tfx-copybara Aug 11, 2020
2feb8e3

Minor refactor.


tfx-copybara Aug 13, 2020
52e424e

Add support for converting prensor to `StructuredTensor`.


andylou2 Aug 18, 2020
218ef17

Switched to using the py3.8 docker image to build s2t.


brills Aug 18, 2020
b68b690

Drop py2 support.


andylou2 Aug 25, 2020
4a422bf

Deprecated Py3.5 support and adding kokoro jobs py3.8


tfx-copybara Aug 26, 2020
aab8be8

remove six from prensor.py


andylou2 Sep 8, 2020
0e5e2bf

no-op.


andylou2 Sep 9, 2020
74ee9bc

Update code to python 3 style guide.


andylou2 Sep 10, 2020
b1b9cff

add code block to documentation


andylou2 Sep 14, 2020
37870fc

Prepares struct2tensor 0.24.0 release.


tfx-copybara Sep 14, 2020
52e2696

Update version.py


dhruvesh09 Oct 26, 2020
b8c445b

Merge branch 'r0.24.0' into r0.23.0


dhruvesh09 Oct 26, 2020
69ef5f9

Update RELEASE.md


dhruvesh09 Oct 26, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ through Google's colab environment, or [download the
file](examples/prensor_playground.ipynb) to run it in your own Jupyter
environment.


There are two main use cases of this repo:

1. To create a PIP package. The PIP package contains plug-ins (OpKernels) to an
Expand Down

19 changes: 19 additions & 0 deletions
RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
# `struct2tensor` release notes

## Release 0.24.0

## Major Features and Improvements

* Add support for converting prensor to `StructuredTensor`.

## Bug Fixes and Other Changes

* Depends on `tensorflow>=2.3.0,<2.4`
* Depends on `tensorflow-metadata>=0.24,<0.25`ghfcch

## Breaking changes

* N/A

## Deprecations

* Deprecated py3.5 support

## Release 0.23.0

### Major Features and Improvements
Expand Down

7 changes: 2 additions & 5 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,6 @@
# limitations under the License.
# ==============================================================================
"""Setup for pip package."""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from setuptools import find_packages
from setuptools import setup
Expand DownExpand Up@@ -63,7 +60,7 @@ def has_ext_modules(self):
 install_requires=[
 'protobuf>=3.8.0,<4',
 'tensorflow>=2.3.0,<2.4',
 'tensorflow_metadata>=0.23,<0.24',
 'tensorflow_metadata>=0.24,<0.25',
 'pyarrow>=0.15,<1',
 ],
 # Add in any packaged data.
Expand All@@ -81,9 +78,9 @@ def has_ext_modules(self):
 'Operating System :: MacOS :: MacOS X',
 'Operating System :: POSIX :: Linux',
 'Programming Language :: Python',
 'Programming Language :: Python :: 3',
 'Programming Language :: Python :: 3.6',
 'Programming Language :: Python :: 3.7',
 'Programming Language :: Python :: 3.8',
 'Programming Language :: Python :: 3 :: Only',
 'Topic :: Scientific/Engineering',
 'Topic :: Scientific/Engineering :: Artificial Intelligence',
Expand Down

31 changes: 22 additions & 9 deletions
struct2tensor/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ s2t_pytype_library(
 srcs = [
 "__init__.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":expression",
Expand All@@ -60,7 +60,7 @@ s2t_pytype_library(
 srcs = [
 "path.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = ["@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:metadata_v0_proto_py_pb2"],
)

Expand All@@ -73,7 +73,7 @@ s2t_pytype_library(
 "prensor_util.py",
 "prensor_value.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -90,7 +90,7 @@ s2t_pytype_library(
 srcs = [
 "calculate_options.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
)

# Note: do not separate these, as eventually we want to make sure that they
Expand DownExpand Up@@ -119,7 +119,7 @@ s2t_pytype_library(
 "expression_impl/size.py",
 "expression_impl/slice_expression.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -136,7 +136,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/map_prensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":path",
Expand All@@ -149,7 +149,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/placeholder.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -163,6 +163,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/parquet.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -179,20 +180,32 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/proto_test_util.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 "//struct2tensor/test:test_py_pb2",
 "@com_google_protobuf//:protobuf_python",
 ],
)

s2t_pytype_library(
 name = "prensor_to_structured_tensor",
 srcs = [
 "prensor_to_structured_tensor.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
 ],
)

s2t_pytype_library(
 name = "structured_tensor_to_prensor",
 srcs = [
 "structured_tensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
Expand Down

11 changes: 4 additions & 7 deletions
struct2tensor/calculate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,14 @@
 calculation.

"""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

# type(id(...)), disambiguated for clarity
IDExpression = int
Expand DownExpand Up@@ -252,7 +249,7 @@ def __eq__(self, node: "_ExpressionNode") -> bool:
 # as opposed to semantic equality.
 return all([a is b for a, b in zip(self.sources, node.sources)])

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return ("expression: {expression} sources: {sources} destinations: "
 "{destinations} value: {value}").format(
 expression=str(self.expression),
Expand DownExpand Up@@ -378,7 +375,7 @@ class OriginalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, expressions: Sequence[expression.Expression]):
 super(OriginalExpressionGraph, self).__init__()
 super().__init__()
 self._add_expressions(expressions)
 original_nodes = list(self._node.values())
 self._find_destinations(original_nodes)
Expand DownExpand Up@@ -431,7 +428,7 @@ class CanonicalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, original: ExpressionGraph):
 super(CanonicalExpressionGraph, self).__init__()
 super().__init__()
 # Nodes indexed by _ExpressionNode.
 self._node_map = {} # type: Dict[_ExpressionNode, _ExpressionNode]
 self._add_expressions([x.expression for x in original.ordered_node_list])
Expand Down

5 changes: 0 additions & 5 deletions
struct2tensor/calculate_options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,6 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function


class Options(object):
 """Options for calculate functions.
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.calculate."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import random

from struct2tensor import calculate
Expand Down

15 changes: 8 additions & 7 deletions
struct2tensor/calculate_with_source_paths.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,28 +12,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Given an expression, calculate the prensor and source paths."""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import List, NamedTuple, Optional, Sequence, Set, Tuple

import collections
from struct2tensor import calculate
from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
from struct2tensor.expression_impl import proto
from struct2tensor.proto import query_metadata_pb2
from typing import List, Optional, Sequence, Set, Tuple
import tensorflow as tf

from google.protobuf import descriptor

# A proto summary represents the tensor of protos and descriptor, along with
# all the paths associated with it.
# tensor is tf.Tensor
# descriptor is descriptor.Descriptor
# paths is List[path.Path]
ProtoRequirements = collections.namedtuple("ProtoRequirements",
 ["tensor", "descriptor", "paths"]) # pylint: disable=invalid-name
ProtoRequirements = NamedTuple("ProtoRequirements",
 [("tensor", tf.Tensor),
 ("descriptor", descriptor.Descriptor),
 ("paths", List[path.Path])])


def calculate_prensors_with_source_paths(
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_with_source_paths_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for calculate_with_source_paths."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import calculate_with_source_paths
from struct2tensor import path
Expand Down

10 changes: 3 additions & 7 deletions
struct2tensor/create_expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,17 +17,13 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import FrozenSet, Mapping, Optional, Sequence

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import FrozenSet, Mapping, Optional, Sequence


class _DirectExpression(expression.Expression):
Expand All@@ -47,7 +43,7 @@ def __init__(self, is_repeated: bool, my_type: Optional[tf.DType],
 value: the return value of calculate(...)
 children: the subexpressions.
 """
 super(_DirectExpression, self).__init__(is_repeated, my_type)
 super().__init__(is_repeated, my_type)
 self._value = value
 self._children = children

Expand DownExpand Up@@ -75,7 +71,7 @@ def _get_child_impl(self,
 def known_field_names(self) -> FrozenSet[path.Step]:
 return frozenset(self._children.keys())

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return "_DirectExpression: {}".format(str(id(self)))


Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/create_expression_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.create_expression."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import create_expression
from struct2tensor import path
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update version.py by dhruvesh09 · Pull Request #2 · google/struct2tensor · GitHub
Skip to content
Update version.py#2

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

 Closed

dhruvesh09
wants to merge
14
commits into

from

 Closed


Update version.py
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
f21b8d1

Prepare for 0.24.0.dev Release


tfx-copybara Aug 11, 2020
2feb8e3

Minor refactor.


tfx-copybara Aug 13, 2020
52e424e

Add support for converting prensor to `StructuredTensor`.


andylou2 Aug 18, 2020
218ef17

Switched to using the py3.8 docker image to build s2t.


brills Aug 18, 2020
b68b690

Drop py2 support.


andylou2 Aug 25, 2020
4a422bf

Deprecated Py3.5 support and adding kokoro jobs py3.8


tfx-copybara Aug 26, 2020
aab8be8

remove six from prensor.py


andylou2 Sep 8, 2020
0e5e2bf

no-op.


andylou2 Sep 9, 2020
74ee9bc

Update code to python 3 style guide.


andylou2 Sep 10, 2020
b1b9cff

add code block to documentation


andylou2 Sep 14, 2020
37870fc

Prepares struct2tensor 0.24.0 release.


tfx-copybara Sep 14, 2020
52e2696

Update version.py


dhruvesh09 Oct 26, 2020
b8c445b

Merge branch 'r0.24.0' into r0.23.0


dhruvesh09 Oct 26, 2020
69ef5f9

Update RELEASE.md


dhruvesh09 Oct 26, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ through Google's colab environment, or [download the
file](examples/prensor_playground.ipynb) to run it in your own Jupyter
environment.


There are two main use cases of this repo:

1. To create a PIP package. The PIP package contains plug-ins (OpKernels) to an
Expand Down

19 changes: 19 additions & 0 deletions
RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
# `struct2tensor` release notes

## Release 0.24.0

## Major Features and Improvements

* Add support for converting prensor to `StructuredTensor`.

## Bug Fixes and Other Changes

* Depends on `tensorflow>=2.3.0,<2.4`
* Depends on `tensorflow-metadata>=0.24,<0.25`ghfcch

## Breaking changes

* N/A

## Deprecations

* Deprecated py3.5 support

## Release 0.23.0

### Major Features and Improvements
Expand Down

7 changes: 2 additions & 5 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,6 @@
# limitations under the License.
# ==============================================================================
"""Setup for pip package."""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from setuptools import find_packages
from setuptools import setup
Expand DownExpand Up@@ -63,7 +60,7 @@ def has_ext_modules(self):
 install_requires=[
 'protobuf>=3.8.0,<4',
 'tensorflow>=2.3.0,<2.4',
 'tensorflow_metadata>=0.23,<0.24',
 'tensorflow_metadata>=0.24,<0.25',
 'pyarrow>=0.15,<1',
 ],
 # Add in any packaged data.
Expand All@@ -81,9 +78,9 @@ def has_ext_modules(self):
 'Operating System :: MacOS :: MacOS X',
 'Operating System :: POSIX :: Linux',
 'Programming Language :: Python',
 'Programming Language :: Python :: 3',
 'Programming Language :: Python :: 3.6',
 'Programming Language :: Python :: 3.7',
 'Programming Language :: Python :: 3.8',
 'Programming Language :: Python :: 3 :: Only',
 'Topic :: Scientific/Engineering',
 'Topic :: Scientific/Engineering :: Artificial Intelligence',
Expand Down

31 changes: 22 additions & 9 deletions
struct2tensor/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ s2t_pytype_library(
 srcs = [
 "__init__.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":expression",
Expand All@@ -60,7 +60,7 @@ s2t_pytype_library(
 srcs = [
 "path.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = ["@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:metadata_v0_proto_py_pb2"],
)

Expand All@@ -73,7 +73,7 @@ s2t_pytype_library(
 "prensor_util.py",
 "prensor_value.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -90,7 +90,7 @@ s2t_pytype_library(
 srcs = [
 "calculate_options.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
)

# Note: do not separate these, as eventually we want to make sure that they
Expand DownExpand Up@@ -119,7 +119,7 @@ s2t_pytype_library(
 "expression_impl/size.py",
 "expression_impl/slice_expression.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -136,7 +136,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/map_prensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":path",
Expand All@@ -149,7 +149,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/placeholder.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -163,6 +163,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/parquet.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -179,20 +180,32 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/proto_test_util.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 "//struct2tensor/test:test_py_pb2",
 "@com_google_protobuf//:protobuf_python",
 ],
)

s2t_pytype_library(
 name = "prensor_to_structured_tensor",
 srcs = [
 "prensor_to_structured_tensor.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
 ],
)

s2t_pytype_library(
 name = "structured_tensor_to_prensor",
 srcs = [
 "structured_tensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
Expand Down

11 changes: 4 additions & 7 deletions
struct2tensor/calculate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,14 @@
 calculation.

"""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

# type(id(...)), disambiguated for clarity
IDExpression = int
Expand DownExpand Up@@ -252,7 +249,7 @@ def __eq__(self, node: "_ExpressionNode") -> bool:
 # as opposed to semantic equality.
 return all([a is b for a, b in zip(self.sources, node.sources)])

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return ("expression: {expression} sources: {sources} destinations: "
 "{destinations} value: {value}").format(
 expression=str(self.expression),
Expand DownExpand Up@@ -378,7 +375,7 @@ class OriginalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, expressions: Sequence[expression.Expression]):
 super(OriginalExpressionGraph, self).__init__()
 super().__init__()
 self._add_expressions(expressions)
 original_nodes = list(self._node.values())
 self._find_destinations(original_nodes)
Expand DownExpand Up@@ -431,7 +428,7 @@ class CanonicalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, original: ExpressionGraph):
 super(CanonicalExpressionGraph, self).__init__()
 super().__init__()
 # Nodes indexed by _ExpressionNode.
 self._node_map = {} # type: Dict[_ExpressionNode, _ExpressionNode]
 self._add_expressions([x.expression for x in original.ordered_node_list])
Expand Down

5 changes: 0 additions & 5 deletions
struct2tensor/calculate_options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,6 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function


class Options(object):
 """Options for calculate functions.
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.calculate."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import random

from struct2tensor import calculate
Expand Down

15 changes: 8 additions & 7 deletions
struct2tensor/calculate_with_source_paths.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,28 +12,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Given an expression, calculate the prensor and source paths."""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import List, NamedTuple, Optional, Sequence, Set, Tuple

import collections
from struct2tensor import calculate
from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
from struct2tensor.expression_impl import proto
from struct2tensor.proto import query_metadata_pb2
from typing import List, Optional, Sequence, Set, Tuple
import tensorflow as tf

from google.protobuf import descriptor

# A proto summary represents the tensor of protos and descriptor, along with
# all the paths associated with it.
# tensor is tf.Tensor
# descriptor is descriptor.Descriptor
# paths is List[path.Path]
ProtoRequirements = collections.namedtuple("ProtoRequirements",
 ["tensor", "descriptor", "paths"]) # pylint: disable=invalid-name
ProtoRequirements = NamedTuple("ProtoRequirements",
 [("tensor", tf.Tensor),
 ("descriptor", descriptor.Descriptor),
 ("paths", List[path.Path])])


def calculate_prensors_with_source_paths(
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_with_source_paths_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for calculate_with_source_paths."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import calculate_with_source_paths
from struct2tensor import path
Expand Down

10 changes: 3 additions & 7 deletions
struct2tensor/create_expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,17 +17,13 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import FrozenSet, Mapping, Optional, Sequence

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import FrozenSet, Mapping, Optional, Sequence


class _DirectExpression(expression.Expression):
Expand All@@ -47,7 +43,7 @@ def __init__(self, is_repeated: bool, my_type: Optional[tf.DType],
 value: the return value of calculate(...)
 children: the subexpressions.
 """
 super(_DirectExpression, self).__init__(is_repeated, my_type)
 super().__init__(is_repeated, my_type)
 self._value = value
 self._children = children

Expand DownExpand Up@@ -75,7 +71,7 @@ def _get_child_impl(self,
 def known_field_names(self) -> FrozenSet[path.Step]:
 return frozenset(self._children.keys())

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return "_DirectExpression: {}".format(str(id(self)))


Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/create_expression_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.create_expression."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import create_expression
from struct2tensor import path
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Update version.py by dhruvesh09 · Pull Request #2 · google/struct2tensor · GitHub
Skip to content
Update version.py#2

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

 Closed

dhruvesh09
wants to merge
14
commits into

from

 Closed


Update version.py
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
f21b8d1

Prepare for 0.24.0.dev Release


tfx-copybara Aug 11, 2020
2feb8e3

Minor refactor.


tfx-copybara Aug 13, 2020
52e424e

Add support for converting prensor to `StructuredTensor`.


andylou2 Aug 18, 2020
218ef17

Switched to using the py3.8 docker image to build s2t.


brills Aug 18, 2020
b68b690

Drop py2 support.


andylou2 Aug 25, 2020
4a422bf

Deprecated Py3.5 support and adding kokoro jobs py3.8


tfx-copybara Aug 26, 2020
aab8be8

remove six from prensor.py


andylou2 Sep 8, 2020
0e5e2bf

no-op.


andylou2 Sep 9, 2020
74ee9bc

Update code to python 3 style guide.


andylou2 Sep 10, 2020
b1b9cff

add code block to documentation


andylou2 Sep 14, 2020
37870fc

Prepares struct2tensor 0.24.0 release.


tfx-copybara Sep 14, 2020
52e2696

Update version.py


dhruvesh09 Oct 26, 2020
b8c445b

Merge branch 'r0.24.0' into r0.23.0


dhruvesh09 Oct 26, 2020
69ef5f9

Update RELEASE.md


dhruvesh09 Oct 26, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ through Google's colab environment, or [download the
file](examples/prensor_playground.ipynb) to run it in your own Jupyter
environment.


There are two main use cases of this repo:

1. To create a PIP package. The PIP package contains plug-ins (OpKernels) to an
Expand Down

19 changes: 19 additions & 0 deletions
RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
# `struct2tensor` release notes

## Release 0.24.0

## Major Features and Improvements

* Add support for converting prensor to `StructuredTensor`.

## Bug Fixes and Other Changes

* Depends on `tensorflow>=2.3.0,<2.4`
* Depends on `tensorflow-metadata>=0.24,<0.25`ghfcch

## Breaking changes

* N/A

## Deprecations

* Deprecated py3.5 support

## Release 0.23.0

### Major Features and Improvements
Expand Down

7 changes: 2 additions & 5 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,6 @@
# limitations under the License.
# ==============================================================================
"""Setup for pip package."""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from setuptools import find_packages
from setuptools import setup
Expand DownExpand Up@@ -63,7 +60,7 @@ def has_ext_modules(self):
 install_requires=[
 'protobuf>=3.8.0,<4',
 'tensorflow>=2.3.0,<2.4',
 'tensorflow_metadata>=0.23,<0.24',
 'tensorflow_metadata>=0.24,<0.25',
 'pyarrow>=0.15,<1',
 ],
 # Add in any packaged data.
Expand All@@ -81,9 +78,9 @@ def has_ext_modules(self):
 'Operating System :: MacOS :: MacOS X',
 'Operating System :: POSIX :: Linux',
 'Programming Language :: Python',
 'Programming Language :: Python :: 3',
 'Programming Language :: Python :: 3.6',
 'Programming Language :: Python :: 3.7',
 'Programming Language :: Python :: 3.8',
 'Programming Language :: Python :: 3 :: Only',
 'Topic :: Scientific/Engineering',
 'Topic :: Scientific/Engineering :: Artificial Intelligence',
Expand Down

31 changes: 22 additions & 9 deletions
struct2tensor/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ s2t_pytype_library(
 srcs = [
 "__init__.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":expression",
Expand All@@ -60,7 +60,7 @@ s2t_pytype_library(
 srcs = [
 "path.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = ["@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:metadata_v0_proto_py_pb2"],
)

Expand All@@ -73,7 +73,7 @@ s2t_pytype_library(
 "prensor_util.py",
 "prensor_value.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -90,7 +90,7 @@ s2t_pytype_library(
 srcs = [
 "calculate_options.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
)

# Note: do not separate these, as eventually we want to make sure that they
Expand DownExpand Up@@ -119,7 +119,7 @@ s2t_pytype_library(
 "expression_impl/size.py",
 "expression_impl/slice_expression.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -136,7 +136,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/map_prensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":path",
Expand All@@ -149,7 +149,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/placeholder.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -163,6 +163,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/parquet.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -179,20 +180,32 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/proto_test_util.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 "//struct2tensor/test:test_py_pb2",
 "@com_google_protobuf//:protobuf_python",
 ],
)

s2t_pytype_library(
 name = "prensor_to_structured_tensor",
 srcs = [
 "prensor_to_structured_tensor.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
 ],
)

s2t_pytype_library(
 name = "structured_tensor_to_prensor",
 srcs = [
 "structured_tensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
Expand Down

11 changes: 4 additions & 7 deletions
struct2tensor/calculate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,14 @@
 calculation.

"""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

# type(id(...)), disambiguated for clarity
IDExpression = int
Expand DownExpand Up@@ -252,7 +249,7 @@ def __eq__(self, node: "_ExpressionNode") -> bool:
 # as opposed to semantic equality.
 return all([a is b for a, b in zip(self.sources, node.sources)])

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return ("expression: {expression} sources: {sources} destinations: "
 "{destinations} value: {value}").format(
 expression=str(self.expression),
Expand DownExpand Up@@ -378,7 +375,7 @@ class OriginalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, expressions: Sequence[expression.Expression]):
 super(OriginalExpressionGraph, self).__init__()
 super().__init__()
 self._add_expressions(expressions)
 original_nodes = list(self._node.values())
 self._find_destinations(original_nodes)
Expand DownExpand Up@@ -431,7 +428,7 @@ class CanonicalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, original: ExpressionGraph):
 super(CanonicalExpressionGraph, self).__init__()
 super().__init__()
 # Nodes indexed by _ExpressionNode.
 self._node_map = {} # type: Dict[_ExpressionNode, _ExpressionNode]
 self._add_expressions([x.expression for x in original.ordered_node_list])
Expand Down

5 changes: 0 additions & 5 deletions
struct2tensor/calculate_options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,6 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function


class Options(object):
 """Options for calculate functions.
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.calculate."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import random

from struct2tensor import calculate
Expand Down

15 changes: 8 additions & 7 deletions
struct2tensor/calculate_with_source_paths.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,28 +12,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Given an expression, calculate the prensor and source paths."""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import List, NamedTuple, Optional, Sequence, Set, Tuple

import collections
from struct2tensor import calculate
from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
from struct2tensor.expression_impl import proto
from struct2tensor.proto import query_metadata_pb2
from typing import List, Optional, Sequence, Set, Tuple
import tensorflow as tf

from google.protobuf import descriptor

# A proto summary represents the tensor of protos and descriptor, along with
# all the paths associated with it.
# tensor is tf.Tensor
# descriptor is descriptor.Descriptor
# paths is List[path.Path]
ProtoRequirements = collections.namedtuple("ProtoRequirements",
 ["tensor", "descriptor", "paths"]) # pylint: disable=invalid-name
ProtoRequirements = NamedTuple("ProtoRequirements",
 [("tensor", tf.Tensor),
 ("descriptor", descriptor.Descriptor),
 ("paths", List[path.Path])])


def calculate_prensors_with_source_paths(
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_with_source_paths_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for calculate_with_source_paths."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import calculate_with_source_paths
from struct2tensor import path
Expand Down

10 changes: 3 additions & 7 deletions
struct2tensor/create_expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,17 +17,13 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import FrozenSet, Mapping, Optional, Sequence

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import FrozenSet, Mapping, Optional, Sequence


class _DirectExpression(expression.Expression):
Expand All@@ -47,7 +43,7 @@ def __init__(self, is_repeated: bool, my_type: Optional[tf.DType],
 value: the return value of calculate(...)
 children: the subexpressions.
 """
 super(_DirectExpression, self).__init__(is_repeated, my_type)
 super().__init__(is_repeated, my_type)
 self._value = value
 self._children = children

Expand DownExpand Up@@ -75,7 +71,7 @@ def _get_child_impl(self,
 def known_field_names(self) -> FrozenSet[path.Step]:
 return frozenset(self._children.keys())

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return "_DirectExpression: {}".format(str(id(self)))


Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/create_expression_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.create_expression."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import create_expression
from struct2tensor import path
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update version.py by dhruvesh09 · Pull Request #2 · google/struct2tensor · GitHub
Skip to content
Update version.py#2

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

 Closed

dhruvesh09
wants to merge
14
commits into

from

 Closed


Update version.py
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
f21b8d1

Prepare for 0.24.0.dev Release


tfx-copybara Aug 11, 2020
2feb8e3

Minor refactor.


tfx-copybara Aug 13, 2020
52e424e

Add support for converting prensor to `StructuredTensor`.


andylou2 Aug 18, 2020
218ef17

Switched to using the py3.8 docker image to build s2t.


brills Aug 18, 2020
b68b690

Drop py2 support.


andylou2 Aug 25, 2020
4a422bf

Deprecated Py3.5 support and adding kokoro jobs py3.8


tfx-copybara Aug 26, 2020
aab8be8

remove six from prensor.py


andylou2 Sep 8, 2020
0e5e2bf

no-op.


andylou2 Sep 9, 2020
74ee9bc

Update code to python 3 style guide.


andylou2 Sep 10, 2020
b1b9cff

add code block to documentation


andylou2 Sep 14, 2020
37870fc

Prepares struct2tensor 0.24.0 release.


tfx-copybara Sep 14, 2020
52e2696

Update version.py


dhruvesh09 Oct 26, 2020
b8c445b

Merge branch 'r0.24.0' into r0.23.0


dhruvesh09 Oct 26, 2020
69ef5f9

Update RELEASE.md


dhruvesh09 Oct 26, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ through Google's colab environment, or [download the
file](examples/prensor_playground.ipynb) to run it in your own Jupyter
environment.


There are two main use cases of this repo:

1. To create a PIP package. The PIP package contains plug-ins (OpKernels) to an
Expand Down

19 changes: 19 additions & 0 deletions
RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
# `struct2tensor` release notes

## Release 0.24.0

## Major Features and Improvements

* Add support for converting prensor to `StructuredTensor`.

## Bug Fixes and Other Changes

* Depends on `tensorflow>=2.3.0,<2.4`
* Depends on `tensorflow-metadata>=0.24,<0.25`ghfcch

## Breaking changes

* N/A

## Deprecations

* Deprecated py3.5 support

## Release 0.23.0

### Major Features and Improvements
Expand Down

7 changes: 2 additions & 5 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,6 @@
# limitations under the License.
# ==============================================================================
"""Setup for pip package."""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from setuptools import find_packages
from setuptools import setup
Expand DownExpand Up@@ -63,7 +60,7 @@ def has_ext_modules(self):
 install_requires=[
 'protobuf>=3.8.0,<4',
 'tensorflow>=2.3.0,<2.4',
 'tensorflow_metadata>=0.23,<0.24',
 'tensorflow_metadata>=0.24,<0.25',
 'pyarrow>=0.15,<1',
 ],
 # Add in any packaged data.
Expand All@@ -81,9 +78,9 @@ def has_ext_modules(self):
 'Operating System :: MacOS :: MacOS X',
 'Operating System :: POSIX :: Linux',
 'Programming Language :: Python',
 'Programming Language :: Python :: 3',
 'Programming Language :: Python :: 3.6',
 'Programming Language :: Python :: 3.7',
 'Programming Language :: Python :: 3.8',
 'Programming Language :: Python :: 3 :: Only',
 'Topic :: Scientific/Engineering',
 'Topic :: Scientific/Engineering :: Artificial Intelligence',
Expand Down

31 changes: 22 additions & 9 deletions
struct2tensor/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ s2t_pytype_library(
 srcs = [
 "__init__.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":expression",
Expand All@@ -60,7 +60,7 @@ s2t_pytype_library(
 srcs = [
 "path.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = ["@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:metadata_v0_proto_py_pb2"],
)

Expand All@@ -73,7 +73,7 @@ s2t_pytype_library(
 "prensor_util.py",
 "prensor_value.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -90,7 +90,7 @@ s2t_pytype_library(
 srcs = [
 "calculate_options.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
)

# Note: do not separate these, as eventually we want to make sure that they
Expand DownExpand Up@@ -119,7 +119,7 @@ s2t_pytype_library(
 "expression_impl/size.py",
 "expression_impl/slice_expression.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -136,7 +136,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/map_prensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":path",
Expand All@@ -149,7 +149,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/placeholder.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -163,6 +163,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/parquet.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -179,20 +180,32 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/proto_test_util.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 "//struct2tensor/test:test_py_pb2",
 "@com_google_protobuf//:protobuf_python",
 ],
)

s2t_pytype_library(
 name = "prensor_to_structured_tensor",
 srcs = [
 "prensor_to_structured_tensor.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
 ],
)

s2t_pytype_library(
 name = "structured_tensor_to_prensor",
 srcs = [
 "structured_tensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
Expand Down

11 changes: 4 additions & 7 deletions
struct2tensor/calculate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,14 @@
 calculation.

"""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

# type(id(...)), disambiguated for clarity
IDExpression = int
Expand DownExpand Up@@ -252,7 +249,7 @@ def __eq__(self, node: "_ExpressionNode") -> bool:
 # as opposed to semantic equality.
 return all([a is b for a, b in zip(self.sources, node.sources)])

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return ("expression: {expression} sources: {sources} destinations: "
 "{destinations} value: {value}").format(
 expression=str(self.expression),
Expand DownExpand Up@@ -378,7 +375,7 @@ class OriginalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, expressions: Sequence[expression.Expression]):
 super(OriginalExpressionGraph, self).__init__()
 super().__init__()
 self._add_expressions(expressions)
 original_nodes = list(self._node.values())
 self._find_destinations(original_nodes)
Expand DownExpand Up@@ -431,7 +428,7 @@ class CanonicalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, original: ExpressionGraph):
 super(CanonicalExpressionGraph, self).__init__()
 super().__init__()
 # Nodes indexed by _ExpressionNode.
 self._node_map = {} # type: Dict[_ExpressionNode, _ExpressionNode]
 self._add_expressions([x.expression for x in original.ordered_node_list])
Expand Down

5 changes: 0 additions & 5 deletions
struct2tensor/calculate_options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,6 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function


class Options(object):
 """Options for calculate functions.
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.calculate."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import random

from struct2tensor import calculate
Expand Down

15 changes: 8 additions & 7 deletions
struct2tensor/calculate_with_source_paths.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,28 +12,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Given an expression, calculate the prensor and source paths."""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import List, NamedTuple, Optional, Sequence, Set, Tuple

import collections
from struct2tensor import calculate
from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
from struct2tensor.expression_impl import proto
from struct2tensor.proto import query_metadata_pb2
from typing import List, Optional, Sequence, Set, Tuple
import tensorflow as tf

from google.protobuf import descriptor

# A proto summary represents the tensor of protos and descriptor, along with
# all the paths associated with it.
# tensor is tf.Tensor
# descriptor is descriptor.Descriptor
# paths is List[path.Path]
ProtoRequirements = collections.namedtuple("ProtoRequirements",
 ["tensor", "descriptor", "paths"]) # pylint: disable=invalid-name
ProtoRequirements = NamedTuple("ProtoRequirements",
 [("tensor", tf.Tensor),
 ("descriptor", descriptor.Descriptor),
 ("paths", List[path.Path])])


def calculate_prensors_with_source_paths(
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_with_source_paths_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for calculate_with_source_paths."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import calculate_with_source_paths
from struct2tensor import path
Expand Down

10 changes: 3 additions & 7 deletions
struct2tensor/create_expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,17 +17,13 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import FrozenSet, Mapping, Optional, Sequence

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import FrozenSet, Mapping, Optional, Sequence


class _DirectExpression(expression.Expression):
Expand All@@ -47,7 +43,7 @@ def __init__(self, is_repeated: bool, my_type: Optional[tf.DType],
 value: the return value of calculate(...)
 children: the subexpressions.
 """
 super(_DirectExpression, self).__init__(is_repeated, my_type)
 super().__init__(is_repeated, my_type)
 self._value = value
 self._children = children

Expand DownExpand Up@@ -75,7 +71,7 @@ def _get_child_impl(self,
 def known_field_names(self) -> FrozenSet[path.Step]:
 return frozenset(self._children.keys())

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return "_DirectExpression: {}".format(str(id(self)))


Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/create_expression_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.create_expression."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import create_expression
from struct2tensor import path
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update version.py by dhruvesh09 · Pull Request #2 · google/struct2tensor · GitHub
Skip to content
Update version.py#2

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

 Closed

dhruvesh09
wants to merge
14
commits into

from

 Closed


Update version.py
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
f21b8d1

Prepare for 0.24.0.dev Release


tfx-copybara Aug 11, 2020
2feb8e3

Minor refactor.


tfx-copybara Aug 13, 2020
52e424e

Add support for converting prensor to `StructuredTensor`.


andylou2 Aug 18, 2020
218ef17

Switched to using the py3.8 docker image to build s2t.


brills Aug 18, 2020
b68b690

Drop py2 support.


andylou2 Aug 25, 2020
4a422bf

Deprecated Py3.5 support and adding kokoro jobs py3.8


tfx-copybara Aug 26, 2020
aab8be8

remove six from prensor.py


andylou2 Sep 8, 2020
0e5e2bf

no-op.


andylou2 Sep 9, 2020
74ee9bc

Update code to python 3 style guide.


andylou2 Sep 10, 2020
b1b9cff

add code block to documentation


andylou2 Sep 14, 2020
37870fc

Prepares struct2tensor 0.24.0 release.


tfx-copybara Sep 14, 2020
52e2696

Update version.py


dhruvesh09 Oct 26, 2020
b8c445b

Merge branch 'r0.24.0' into r0.23.0


dhruvesh09 Oct 26, 2020
69ef5f9

Update RELEASE.md


dhruvesh09 Oct 26, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ through Google's colab environment, or [download the
file](examples/prensor_playground.ipynb) to run it in your own Jupyter
environment.


There are two main use cases of this repo:

1. To create a PIP package. The PIP package contains plug-ins (OpKernels) to an
Expand Down

19 changes: 19 additions & 0 deletions
RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
# `struct2tensor` release notes

## Release 0.24.0

## Major Features and Improvements

* Add support for converting prensor to `StructuredTensor`.

## Bug Fixes and Other Changes

* Depends on `tensorflow>=2.3.0,<2.4`
* Depends on `tensorflow-metadata>=0.24,<0.25`ghfcch

## Breaking changes

* N/A

## Deprecations

* Deprecated py3.5 support

## Release 0.23.0

### Major Features and Improvements
Expand Down

7 changes: 2 additions & 5 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,6 @@
# limitations under the License.
# ==============================================================================
"""Setup for pip package."""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from setuptools import find_packages
from setuptools import setup
Expand DownExpand Up@@ -63,7 +60,7 @@ def has_ext_modules(self):
 install_requires=[
 'protobuf>=3.8.0,<4',
 'tensorflow>=2.3.0,<2.4',
 'tensorflow_metadata>=0.23,<0.24',
 'tensorflow_metadata>=0.24,<0.25',
 'pyarrow>=0.15,<1',
 ],
 # Add in any packaged data.
Expand All@@ -81,9 +78,9 @@ def has_ext_modules(self):
 'Operating System :: MacOS :: MacOS X',
 'Operating System :: POSIX :: Linux',
 'Programming Language :: Python',
 'Programming Language :: Python :: 3',
 'Programming Language :: Python :: 3.6',
 'Programming Language :: Python :: 3.7',
 'Programming Language :: Python :: 3.8',
 'Programming Language :: Python :: 3 :: Only',
 'Topic :: Scientific/Engineering',
 'Topic :: Scientific/Engineering :: Artificial Intelligence',
Expand Down

31 changes: 22 additions & 9 deletions
struct2tensor/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ s2t_pytype_library(
 srcs = [
 "__init__.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":expression",
Expand All@@ -60,7 +60,7 @@ s2t_pytype_library(
 srcs = [
 "path.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = ["@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:metadata_v0_proto_py_pb2"],
)

Expand All@@ -73,7 +73,7 @@ s2t_pytype_library(
 "prensor_util.py",
 "prensor_value.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -90,7 +90,7 @@ s2t_pytype_library(
 srcs = [
 "calculate_options.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
)

# Note: do not separate these, as eventually we want to make sure that they
Expand DownExpand Up@@ -119,7 +119,7 @@ s2t_pytype_library(
 "expression_impl/size.py",
 "expression_impl/slice_expression.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -136,7 +136,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/map_prensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":path",
Expand All@@ -149,7 +149,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/placeholder.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -163,6 +163,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/parquet.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -179,20 +180,32 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/proto_test_util.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 "//struct2tensor/test:test_py_pb2",
 "@com_google_protobuf//:protobuf_python",
 ],
)

s2t_pytype_library(
 name = "prensor_to_structured_tensor",
 srcs = [
 "prensor_to_structured_tensor.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
 ],
)

s2t_pytype_library(
 name = "structured_tensor_to_prensor",
 srcs = [
 "structured_tensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
Expand Down

11 changes: 4 additions & 7 deletions
struct2tensor/calculate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,14 @@
 calculation.

"""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

# type(id(...)), disambiguated for clarity
IDExpression = int
Expand DownExpand Up@@ -252,7 +249,7 @@ def __eq__(self, node: "_ExpressionNode") -> bool:
 # as opposed to semantic equality.
 return all([a is b for a, b in zip(self.sources, node.sources)])

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return ("expression: {expression} sources: {sources} destinations: "
 "{destinations} value: {value}").format(
 expression=str(self.expression),
Expand DownExpand Up@@ -378,7 +375,7 @@ class OriginalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, expressions: Sequence[expression.Expression]):
 super(OriginalExpressionGraph, self).__init__()
 super().__init__()
 self._add_expressions(expressions)
 original_nodes = list(self._node.values())
 self._find_destinations(original_nodes)
Expand DownExpand Up@@ -431,7 +428,7 @@ class CanonicalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, original: ExpressionGraph):
 super(CanonicalExpressionGraph, self).__init__()
 super().__init__()
 # Nodes indexed by _ExpressionNode.
 self._node_map = {} # type: Dict[_ExpressionNode, _ExpressionNode]
 self._add_expressions([x.expression for x in original.ordered_node_list])
Expand Down

5 changes: 0 additions & 5 deletions
struct2tensor/calculate_options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,6 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function


class Options(object):
 """Options for calculate functions.
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.calculate."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import random

from struct2tensor import calculate
Expand Down

15 changes: 8 additions & 7 deletions
struct2tensor/calculate_with_source_paths.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,28 +12,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Given an expression, calculate the prensor and source paths."""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import List, NamedTuple, Optional, Sequence, Set, Tuple

import collections
from struct2tensor import calculate
from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
from struct2tensor.expression_impl import proto
from struct2tensor.proto import query_metadata_pb2
from typing import List, Optional, Sequence, Set, Tuple
import tensorflow as tf

from google.protobuf import descriptor

# A proto summary represents the tensor of protos and descriptor, along with
# all the paths associated with it.
# tensor is tf.Tensor
# descriptor is descriptor.Descriptor
# paths is List[path.Path]
ProtoRequirements = collections.namedtuple("ProtoRequirements",
 ["tensor", "descriptor", "paths"]) # pylint: disable=invalid-name
ProtoRequirements = NamedTuple("ProtoRequirements",
 [("tensor", tf.Tensor),
 ("descriptor", descriptor.Descriptor),
 ("paths", List[path.Path])])


def calculate_prensors_with_source_paths(
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_with_source_paths_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for calculate_with_source_paths."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import calculate_with_source_paths
from struct2tensor import path
Expand Down

10 changes: 3 additions & 7 deletions
struct2tensor/create_expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,17 +17,13 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import FrozenSet, Mapping, Optional, Sequence

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import FrozenSet, Mapping, Optional, Sequence


class _DirectExpression(expression.Expression):
Expand All@@ -47,7 +43,7 @@ def __init__(self, is_repeated: bool, my_type: Optional[tf.DType],
 value: the return value of calculate(...)
 children: the subexpressions.
 """
 super(_DirectExpression, self).__init__(is_repeated, my_type)
 super().__init__(is_repeated, my_type)
 self._value = value
 self._children = children

Expand DownExpand Up@@ -75,7 +71,7 @@ def _get_child_impl(self,
 def known_field_names(self) -> FrozenSet[path.Step]:
 return frozenset(self._children.keys())

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return "_DirectExpression: {}".format(str(id(self)))


Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/create_expression_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.create_expression."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import create_expression
from struct2tensor import path
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Update version.py by dhruvesh09 · Pull Request #2 · google/struct2tensor · GitHub
Skip to content
Update version.py#2

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

 Closed

dhruvesh09
wants to merge
14
commits into

from

 Closed


Update version.py
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
f21b8d1

Prepare for 0.24.0.dev Release


tfx-copybara Aug 11, 2020
2feb8e3

Minor refactor.


tfx-copybara Aug 13, 2020
52e424e

Add support for converting prensor to `StructuredTensor`.


andylou2 Aug 18, 2020
218ef17

Switched to using the py3.8 docker image to build s2t.


brills Aug 18, 2020
b68b690

Drop py2 support.


andylou2 Aug 25, 2020
4a422bf

Deprecated Py3.5 support and adding kokoro jobs py3.8


tfx-copybara Aug 26, 2020
aab8be8

remove six from prensor.py


andylou2 Sep 8, 2020
0e5e2bf

no-op.


andylou2 Sep 9, 2020
74ee9bc

Update code to python 3 style guide.


andylou2 Sep 10, 2020
b1b9cff

add code block to documentation


andylou2 Sep 14, 2020
37870fc

Prepares struct2tensor 0.24.0 release.


tfx-copybara Sep 14, 2020
52e2696

Update version.py


dhruvesh09 Oct 26, 2020
b8c445b

Merge branch 'r0.24.0' into r0.23.0


dhruvesh09 Oct 26, 2020
69ef5f9

Update RELEASE.md


dhruvesh09 Oct 26, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ through Google's colab environment, or [download the
file](examples/prensor_playground.ipynb) to run it in your own Jupyter
environment.


There are two main use cases of this repo:

1. To create a PIP package. The PIP package contains plug-ins (OpKernels) to an
Expand Down

19 changes: 19 additions & 0 deletions
RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
# `struct2tensor` release notes

## Release 0.24.0

## Major Features and Improvements

* Add support for converting prensor to `StructuredTensor`.

## Bug Fixes and Other Changes

* Depends on `tensorflow>=2.3.0,<2.4`
* Depends on `tensorflow-metadata>=0.24,<0.25`ghfcch

## Breaking changes

* N/A

## Deprecations

* Deprecated py3.5 support

## Release 0.23.0

### Major Features and Improvements
Expand Down

7 changes: 2 additions & 5 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,9 +13,6 @@
# limitations under the License.
# ==============================================================================
"""Setup for pip package."""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from setuptools import find_packages
from setuptools import setup
Expand DownExpand Up@@ -63,7 +60,7 @@ def has_ext_modules(self):
 install_requires=[
 'protobuf>=3.8.0,<4',
 'tensorflow>=2.3.0,<2.4',
 'tensorflow_metadata>=0.23,<0.24',
 'tensorflow_metadata>=0.24,<0.25',
 'pyarrow>=0.15,<1',
 ],
 # Add in any packaged data.
Expand All@@ -81,9 +78,9 @@ def has_ext_modules(self):
 'Operating System :: MacOS :: MacOS X',
 'Operating System :: POSIX :: Linux',
 'Programming Language :: Python',
 'Programming Language :: Python :: 3',
 'Programming Language :: Python :: 3.6',
 'Programming Language :: Python :: 3.7',
 'Programming Language :: Python :: 3.8',
 'Programming Language :: Python :: 3 :: Only',
 'Topic :: Scientific/Engineering',
 'Topic :: Scientific/Engineering :: Artificial Intelligence',
Expand Down

31 changes: 22 additions & 9 deletions
struct2tensor/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ s2t_pytype_library(
 srcs = [
 "__init__.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":expression",
Expand All@@ -60,7 +60,7 @@ s2t_pytype_library(
 srcs = [
 "path.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = ["@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:metadata_v0_proto_py_pb2"],
)

Expand All@@ -73,7 +73,7 @@ s2t_pytype_library(
 "prensor_util.py",
 "prensor_value.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -90,7 +90,7 @@ s2t_pytype_library(
 srcs = [
 "calculate_options.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
)

# Note: do not separate these, as eventually we want to make sure that they
Expand DownExpand Up@@ -119,7 +119,7 @@ s2t_pytype_library(
 "expression_impl/size.py",
 "expression_impl/slice_expression.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":calculate_options",
 ":path",
Expand All@@ -136,7 +136,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/map_prensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":path",
Expand All@@ -149,7 +149,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/placeholder.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -163,6 +163,7 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/parquet.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 ":map_prensor_to_prensor",
Expand All@@ -179,20 +180,32 @@ s2t_pytype_library(
 srcs = [
 "expression_impl/proto_test_util.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":expression",
 "//struct2tensor/test:test_py_pb2",
 "@com_google_protobuf//:protobuf_python",
 ],
)

s2t_pytype_library(
 name = "prensor_to_structured_tensor",
 srcs = [
 "prensor_to_structured_tensor.py",
 ],
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
 ],
)

s2t_pytype_library(
 name = "structured_tensor_to_prensor",
 srcs = [
 "structured_tensor_to_prensor.py",
 ],
 srcs_version = "PY2AND3",
 srcs_version = "PY3ONLY",
 deps = [
 ":path",
 ":prensor",
Expand Down

11 changes: 4 additions & 7 deletions
struct2tensor/calculate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,14 @@
 calculation.

"""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import Dict, List, Mapping, Optional, Sequence, Tuple

# type(id(...)), disambiguated for clarity
IDExpression = int
Expand DownExpand Up@@ -252,7 +249,7 @@ def __eq__(self, node: "_ExpressionNode") -> bool:
 # as opposed to semantic equality.
 return all([a is b for a, b in zip(self.sources, node.sources)])

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return ("expression: {expression} sources: {sources} destinations: "
 "{destinations} value: {value}").format(
 expression=str(self.expression),
Expand DownExpand Up@@ -378,7 +375,7 @@ class OriginalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, expressions: Sequence[expression.Expression]):
 super(OriginalExpressionGraph, self).__init__()
 super().__init__()
 self._add_expressions(expressions)
 original_nodes = list(self._node.values())
 self._find_destinations(original_nodes)
Expand DownExpand Up@@ -431,7 +428,7 @@ class CanonicalExpressionGraph(ExpressionGraph):
 """

 def __init__(self, original: ExpressionGraph):
 super(CanonicalExpressionGraph, self).__init__()
 super().__init__()
 # Nodes indexed by _ExpressionNode.
 self._node_map = {} # type: Dict[_ExpressionNode, _ExpressionNode]
 self._add_expressions([x.expression for x in original.ordered_node_list])
Expand Down

5 changes: 0 additions & 5 deletions
struct2tensor/calculate_options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,6 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function


class Options(object):
 """Options for calculate functions.
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.calculate."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import random

from struct2tensor import calculate
Expand Down

15 changes: 8 additions & 7 deletions
struct2tensor/calculate_with_source_paths.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,28 +12,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Given an expression, calculate the prensor and source paths."""
from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import List, NamedTuple, Optional, Sequence, Set, Tuple

import collections
from struct2tensor import calculate
from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
from struct2tensor.expression_impl import proto
from struct2tensor.proto import query_metadata_pb2
from typing import List, Optional, Sequence, Set, Tuple
import tensorflow as tf

from google.protobuf import descriptor

# A proto summary represents the tensor of protos and descriptor, along with
# all the paths associated with it.
# tensor is tf.Tensor
# descriptor is descriptor.Descriptor
# paths is List[path.Path]
ProtoRequirements = collections.namedtuple("ProtoRequirements",
 ["tensor", "descriptor", "paths"]) # pylint: disable=invalid-name
ProtoRequirements = NamedTuple("ProtoRequirements",
 [("tensor", tf.Tensor),
 ("descriptor", descriptor.Descriptor),
 ("paths", List[path.Path])])


def calculate_prensors_with_source_paths(
Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/calculate_with_source_paths_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for calculate_with_source_paths."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import calculate_with_source_paths
from struct2tensor import path
Expand Down

10 changes: 3 additions & 7 deletions
struct2tensor/create_expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,17 +17,13 @@

"""

from __future__ import absolute_import
from __future__ import division

from __future__ import print_function
from typing import FrozenSet, Mapping, Optional, Sequence

from struct2tensor import calculate_options
from struct2tensor import expression
from struct2tensor import path
from struct2tensor import prensor
import tensorflow as tf
from typing import FrozenSet, Mapping, Optional, Sequence


class _DirectExpression(expression.Expression):
Expand All@@ -47,7 +43,7 @@ def __init__(self, is_repeated: bool, my_type: Optional[tf.DType],
 value: the return value of calculate(...)
 children: the subexpressions.
 """
 super(_DirectExpression, self).__init__(is_repeated, my_type)
 super().__init__(is_repeated, my_type)
 self._value = value
 self._children = children

Expand DownExpand Up@@ -75,7 +71,7 @@ def _get_child_impl(self,
 def known_field_names(self) -> FrozenSet[path.Step]:
 return frozenset(self._children.keys())

 def __str__(self) -> str: # pylint: disable=g-ambiguous-str-annotation
 def __str__(self) -> str:
 return "_DirectExpression: {}".format(str(id(self)))


Expand Down

4 changes: 0 additions & 4 deletions
struct2tensor/create_expression_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,6 @@
# limitations under the License.
"""Tests for struct2tensor.create_expression."""

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

from absl.testing import absltest
from struct2tensor import create_expression
from struct2tensor import path
Expand Down
Loading