Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pytensor
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
testgroup
pytensor
Commits
5062d3e4
提交
5062d3e4
authored
12月 14, 2025
作者:
ricardoV94
提交者:
Ricardo Vieira
1月 05, 2026
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix unboxing of numpy boolean Scalars in C-backend
上级
7cd524ca
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
25 行增加
和
11 行删除
+25
-11
basic.py
pytensor/scalar/basic.py
+18
-6
conv.py
pytensor/tensor/signal/conv.py
+0
-5
test_basic.py
tests/tensor/test_basic.py
+7
-0
没有找到文件。
pytensor/scalar/basic.py
浏览文件 @
5062d3e4
...
@@ -484,20 +484,32 @@ class ScalarType(CType, HasDataType, HasShape):
...
@@ -484,20 +484,32 @@ class ScalarType(CType, HasDataType, HasShape):
def
c_sync
(
self
,
name
,
sub
):
def
c_sync
(
self
,
name
,
sub
):
specs
=
self
.
dtype_specs
()
specs
=
self
.
dtype_specs
()
fail
=
sub
[
"fail"
]
fail
=
sub
[
"fail"
]
dtype
=
specs
[
1
]
(
np_dtype
,
_c_dtype
,
_cls_name
)
=
specs
cls
=
specs
[
2
]
np_dtype_num
=
np
.
dtype
(
np_dtype
)
.
num
return
f
"""
return
f
"""
Py_XDECREF(py_{name});
Py_XDECREF(py_{name});
py_{name} = PyArrayScalar_New({cls});
PyArray_Descr* {name}_descr = PyArray_DescrFromType({np_dtype_num}); // {np_dtype}
if (!{name}_descr) {{
PyErr_Format(PyExc_RuntimeError, "Could not get descriptor for {np_dtype_num}={np_dtype}");
{fail}
}}
// PyArray_Scalar creates a new scalar object by copying data from the pointer &{name}
py_{name} = PyArray_Scalar(&{name}, {name}_descr, NULL);
// Clean up the descriptor reference (PyArray_DescrFromType returns a new ref)
Py_DECREF({name}_descr);
if (!py_{name})
if (!py_{name})
{{
{{
Py_XINCREF(Py_None);
Py_XINCREF(Py_None);
py_{name} = Py_None;
py_{name} = Py_None;
PyErr_Format(PyExc_MemoryError,
PyErr_Format(PyExc_MemoryError,
"Instantiation of new Python
scalar failed ({
dtype})");
"Instantiation of new Python
NumPy scalar failed ({np_dtype_num}={np_
dtype})");
{fail}
{fail}
}}
}}
PyArrayScalar_ASSIGN(py_{name}, {cls}, {name});
"""
"""
def
c_cleanup
(
self
,
name
,
sub
):
def
c_cleanup
(
self
,
name
,
sub
):
...
@@ -731,7 +743,7 @@ class ScalarType(CType, HasDataType, HasShape):
...
@@ -731,7 +743,7 @@ class ScalarType(CType, HasDataType, HasShape):
return
[
"import_array();"
]
return
[
"import_array();"
]
def
c_code_cache_version
(
self
):
def
c_code_cache_version
(
self
):
return
(
1
4
,
np
.
__version__
)
return
(
1
5
,
np
.
__version__
)
def
get_shape_info
(
self
,
obj
):
def
get_shape_info
(
self
,
obj
):
return
obj
.
itemsize
return
obj
.
itemsize
...
...
pytensor/tensor/signal/conv.py
浏览文件 @
5062d3e4
...
@@ -254,11 +254,6 @@ class Convolve2d(AbstractConvolveNd, Op): # type: ignore[misc]
...
@@ -254,11 +254,6 @@ class Convolve2d(AbstractConvolveNd, Op): # type: ignore[misc]
def
perform
(
self
,
node
,
inputs
,
outputs
):
def
perform
(
self
,
node
,
inputs
,
outputs
):
in1
,
in2
,
full_mode
=
inputs
in1
,
in2
,
full_mode
=
inputs
if
isinstance
(
full_mode
,
np
.
bool
):
# Patch for wrong unboxing of bool scalars in C backend
# Conditional, because numba will produce a bool, not np.bool_
full_mode
=
full_mode
.
item
()
mode
=
"full"
if
full_mode
else
"valid"
mode
=
"full"
if
full_mode
else
"valid"
outputs
[
0
][
0
]
=
scipy_convolve
(
in1
,
in2
,
mode
=
mode
,
method
=
self
.
method
)
outputs
[
0
][
0
]
=
scipy_convolve
(
in1
,
in2
,
mode
=
mode
,
method
=
self
.
method
)
...
...
tests/tensor/test_basic.py
浏览文件 @
5062d3e4
...
@@ -2221,6 +2221,13 @@ def test_ScalarFromTensor(cast_policy):
...
@@ -2221,6 +2221,13 @@ def test_ScalarFromTensor(cast_policy):
scalar_from_tensor
(
vector
())
scalar_from_tensor
(
vector
())
def
test_bool_scalar_from_tensor
():
x
=
scalar
(
"x"
,
dtype
=
"bool"
)
fn
=
function
([
x
],
scalar_from_tensor
(
x
))
assert
fn
(
np
.
array
(
True
,
dtype
=
bool
))
assert
not
fn
(
np
.
array
(
False
,
dtype
=
bool
))
def
test_op_cache
():
def
test_op_cache
():
# TODO: What is this actually testing?
# TODO: What is this actually testing?
# trigger bug in ticket #162
# trigger bug in ticket #162
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论