Merge branch 'main' into dependabot/pip/requirements/ci/onnx-weekly-1…

….16.0.dev20231211
microsoft · Dec 12, 2023 · e20ac9f · e20ac9f
2 parents 4875b63 + 9edefbb
commit e20ac9f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -45,7 +45,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           # Version range or exact version of Python to use, using SemVer's version range syntax. Reads from .python-version if unset.
           python-version: "3.10"

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -62,7 +62,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install nox
@@ -97,7 +97,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
           cache: pip
@@ -121,7 +121,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
       - name: Update readme
         run: |
           python docs/update_readme.py

diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml
@@ -29,7 +29,7 @@ jobs:
       - name: Setup Pages
         uses: actions/configure-pages@v4
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - uses: actions/checkout@v4

diff --git a/onnxscript/function_libs/torch_lib/ops/nn.py b/onnxscript/function_libs/torch_lib/ops/nn.py
@@ -596,10 +596,11 @@ def aten_glu_jvp(glu: TensorType, x: TensorType, dx: TensorType, dim: int) -> Te
     raise NotImplementedError()
 
 
-def aten_hardsigmoid(self: TensorType) -> TensorType:
+@torch_op("aten::hardsigmoid")
+def aten_hardsigmoid(self: TFloat) -> TFloat:
     """hardsigmoid(Tensor self) -> Tensor"""
 
-    raise NotImplementedError()
+    return op.HardSigmoid(self, alpha=1 / 6, beta=1 / 2)
 
 
 def aten_hardsigmoid_backward(grad_output: TensorType, self: TensorType) -> TensorType:
@@ -608,10 +609,11 @@ def aten_hardsigmoid_backward(grad_output: TensorType, self: TensorType) -> Tens
     raise NotImplementedError()
 
 
-def aten_hardswish(self: TensorType) -> TensorType:
+@torch_op("aten::hardswish")
+def aten_hardswish(self: TFloat) -> TFloat:
     """hardswish(Tensor self) -> Tensor"""
 
-    raise NotImplementedError()
+    return op.HardSwish(self)
 
 
 def aten_hardswish_backward(grad_output: TensorType, self: TensorType) -> TensorType:

diff --git a/onnxscript/tests/function_libs/torch_lib/ops_test_data.py b/onnxscript/tests/function_libs/torch_lib/ops_test_data.py
@@ -1177,6 +1177,8 @@ def _where_input_wrangler(
         core_ops.aten_embedding,
         input_wrangler=_embedding_input_wrangler,
     ),
+    TorchLibOpInfo("nn.functional.hardsigmoid", nn_ops.aten_hardsigmoid),
+    TorchLibOpInfo("nn.functional.hardswish", nn_ops.aten_hardswish),
     TorchLibOpInfo("nn.functional.hardtanh", nn_ops.aten_hardtanh),
     TorchLibOpInfo("nn.functional.leaky_relu", nn_ops.aten_leaky_relu),
     TorchLibOpInfo(