Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B-ASIC - Better ASIC Toolbox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Computer Engineering
B-ASIC - Better ASIC Toolbox
Commits
54e587c1
Commit
54e587c1
authored
2 years ago
by
Frans Skarman
Browse files
Options
Downloads
Patches
Plain Diff
Fix type errors in 3.8
parent
91cf4c9b
No related branches found
No related tags found
No related merge requests found
Pipeline
#89456
passed
2 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
b_asic/operation.py
+14
-10
14 additions, 10 deletions
b_asic/operation.py
b_asic/types.py
+4
-2
4 additions, 2 deletions
b_asic/types.py
with
18 additions
and
12 deletions
b_asic/operation.py
+
14
−
10
View file @
54e587c1
...
...
@@ -34,7 +34,7 @@ from b_asic.graph_component import (
)
from
b_asic.port
import
InputPort
,
OutputPort
,
SignalSourceProvider
from
b_asic.signal
import
Signal
from
b_asic.types
import
Num
from
b_asic.types
import
Num
,
NumRuntime
if
TYPE_CHECKING
:
# Conditionally imported to avoid circular imports
...
...
@@ -593,7 +593,7 @@ class AbstractOperation(Operation, AbstractGraphComponent):
# Import here to avoid circular imports.
from
b_asic.core_operations
import
Addition
,
Constant
if
isinstance
(
src
,
Num
):
if
isinstance
(
src
,
Num
Runtime
):
return
Addition
(
self
,
Constant
(
src
))
else
:
return
Addition
(
self
,
src
)
...
...
@@ -602,14 +602,16 @@ class AbstractOperation(Operation, AbstractGraphComponent):
# Import here to avoid circular imports.
from
b_asic.core_operations
import
Addition
,
Constant
return
Addition
(
Constant
(
src
)
if
isinstance
(
src
,
Num
)
else
src
,
self
)
return
Addition
(
Constant
(
src
)
if
isinstance
(
src
,
NumRuntime
)
else
src
,
self
)
def
__sub__
(
self
,
src
:
Union
[
SignalSourceProvider
,
Num
])
->
"
Subtraction
"
:
# Import here to avoid circular imports.
from
b_asic.core_operations
import
Constant
,
Subtraction
return
Subtraction
(
self
,
Constant
(
src
)
if
isinstance
(
src
,
Num
)
else
src
self
,
Constant
(
src
)
if
isinstance
(
src
,
Num
Runtime
)
else
src
)
def
__rsub__
(
self
,
src
:
Union
[
SignalSourceProvider
,
Num
])
->
"
Subtraction
"
:
...
...
@@ -617,7 +619,7 @@ class AbstractOperation(Operation, AbstractGraphComponent):
from
b_asic.core_operations
import
Constant
,
Subtraction
return
Subtraction
(
Constant
(
src
)
if
isinstance
(
src
,
Num
)
else
src
,
self
Constant
(
src
)
if
isinstance
(
src
,
Num
Runtime
)
else
src
,
self
)
def
__mul__
(
...
...
@@ -631,7 +633,7 @@ class AbstractOperation(Operation, AbstractGraphComponent):
return
(
ConstantMultiplication
(
src
,
self
)
if
isinstance
(
src
,
Num
)
if
isinstance
(
src
,
Num
Runtime
)
else
Multiplication
(
self
,
src
)
)
...
...
@@ -646,7 +648,7 @@ class AbstractOperation(Operation, AbstractGraphComponent):
return
(
ConstantMultiplication
(
src
,
self
)
if
isinstance
(
src
,
Num
)
if
isinstance
(
src
,
Num
Runtime
)
else
Multiplication
(
src
,
self
)
)
...
...
@@ -654,7 +656,9 @@ class AbstractOperation(Operation, AbstractGraphComponent):
# Import here to avoid circular imports.
from
b_asic.core_operations
import
Constant
,
Division
return
Division
(
self
,
Constant
(
src
)
if
isinstance
(
src
,
Num
)
else
src
)
return
Division
(
self
,
Constant
(
src
)
if
isinstance
(
src
,
NumRuntime
)
else
src
)
def
__rtruediv__
(
self
,
src
:
Union
[
SignalSourceProvider
,
Num
]
...
...
@@ -662,7 +666,7 @@ class AbstractOperation(Operation, AbstractGraphComponent):
# Import here to avoid circular imports.
from
b_asic.core_operations
import
Constant
,
Division
,
Reciprocal
if
isinstance
(
src
,
Num
):
if
isinstance
(
src
,
Num
Runtime
):
if
src
==
1
:
return
Reciprocal
(
self
)
else
:
...
...
@@ -963,7 +967,7 @@ class AbstractOperation(Operation, AbstractGraphComponent):
# TODO: Fix
def
truncate_input
(
self
,
index
:
int
,
value
:
Num
,
bits
:
int
)
->
Num
:
if
isinstance
(
value
,
float
|
int
):
if
isinstance
(
value
,
(
float
,
int
)
)
:
return
round
(
value
)
&
((
2
**
bits
)
-
1
)
else
:
raise
TypeError
...
...
This diff is collapsed.
Click to expand it.
b_asic/types.py
+
4
−
2
View file @
54e587c1
from
typing
import
NewType
from
typing
import
NewType
,
Union
# https://stackoverflow.com/questions/69334475/how-to-hint-at-number-types-i-e-subclasses-of-number-not-numbers-themselv
Num
=
int
|
float
|
complex
Num
=
Union
[
int
,
float
,
complex
]
NumRuntime
=
(
complex
,
float
,
int
)
Name
=
str
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment