Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pytensor
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
testgroup
pytensor
Commits
0f67db4b
提交
0f67db4b
authored
3月 08, 2012
作者:
Olivier Delalleau
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #522 from nouiz/fix_blas
Fix blas
上级
d79dd27b
6d5df8ce
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
18 行增加
和
5 行删除
+18
-5
NEWS.txt
NEWS.txt
+3
-0
may_share_memory.py
theano/misc/may_share_memory.py
+9
-5
blas_c.py
theano/tensor/blas_c.py
+6
-0
没有找到文件。
NEWS.txt
浏览文件 @
0f67db4b
...
@@ -42,6 +42,9 @@ Internal changes
...
@@ -42,6 +42,9 @@ Internal changes
* Define new exceptions MissingInputError and UnusedInputError, and use them
* Define new exceptions MissingInputError and UnusedInputError, and use them
in theano.function, instead of TypeError and ValueError. (Pascal L.)
in theano.function, instead of TypeError and ValueError. (Pascal L.)
Crash Fix
* Don't try to use blas library when told to don't use them(Frederic B.)
=============
=============
Release Notes
Release Notes
=============
=============
...
...
theano/misc/may_share_memory.py
浏览文件 @
0f67db4b
...
@@ -11,6 +11,7 @@ from theano.tensor.basic import TensorType
...
@@ -11,6 +11,7 @@ from theano.tensor.basic import TensorType
try
:
try
:
import
scipy.sparse
import
scipy.sparse
from
theano.sparse.basic
import
SparseType
from
theano.sparse.basic
import
SparseType
def
_is_sparse
(
a
):
def
_is_sparse
(
a
):
return
scipy
.
sparse
.
issparse
(
a
)
return
scipy
.
sparse
.
issparse
(
a
)
except
ImportError
:
except
ImportError
:
...
@@ -26,6 +27,7 @@ else:
...
@@ -26,6 +27,7 @@ else:
def
_is_cuda
(
a
):
def
_is_cuda
(
a
):
return
False
return
False
def
may_share_memory
(
a
,
b
,
raise_other_type
=
True
):
def
may_share_memory
(
a
,
b
,
raise_other_type
=
True
):
a_ndarray
=
isinstance
(
a
,
numpy
.
ndarray
)
a_ndarray
=
isinstance
(
a
,
numpy
.
ndarray
)
b_ndarray
=
isinstance
(
b
,
numpy
.
ndarray
)
b_ndarray
=
isinstance
(
b
,
numpy
.
ndarray
)
...
@@ -34,16 +36,18 @@ def may_share_memory(a, b, raise_other_type=True):
...
@@ -34,16 +36,18 @@ def may_share_memory(a, b, raise_other_type=True):
a_cuda
=
_is_cuda
(
a
)
a_cuda
=
_is_cuda
(
a
)
b_cuda
=
_is_cuda
(
b
)
b_cuda
=
_is_cuda
(
b
)
if
not
(
a_ndarray
or
a_sparse
or
a_cuda
)
or
not
(
b_ndarray
or
b_sparse
or
b_cuda
):
if
(
not
(
a_ndarray
or
a_sparse
or
a_cuda
)
or
not
(
b_ndarray
or
b_sparse
or
b_cuda
)):
if
raise_other_type
:
if
raise_other_type
:
raise
TypeError
(
"may_share_memory support only ndarray and scipy.sparse and CudaNdarray type"
)
raise
TypeError
(
"may_share_memory support only ndarray"
" and scipy.sparse and CudaNdarray type"
)
return
False
return
False
if
a_ndarray
and
b_ndarray
:
if
a_ndarray
and
b_ndarray
:
return
TensorType
.
may_share_memory
(
a
,
b
)
return
TensorType
.
may_share_memory
(
a
,
b
)
if
a_cuda
and
b_cuda
:
if
a_cuda
and
b_cuda
:
from
theano.sandbox.cuda.type
import
CudaNdarrayType
from
theano.sandbox.cuda.type
import
CudaNdarrayType
return
CudaNdarrayType
.
may_share_memory
(
a
,
b
)
return
CudaNdarrayType
.
may_share_memory
(
a
,
b
)
if
a_cuda
or
b_cuda
:
if
a_cuda
or
b_cuda
:
return
False
return
False
return
SparseType
.
may_share_memory
(
a
,
b
)
return
SparseType
.
may_share_memory
(
a
,
b
)
theano/tensor/blas_c.py
浏览文件 @
0f67db4b
from
theano.gof
import
Op
from
theano.gof
import
Op
from
theano
import
config
from
blas
import
ldflags
,
blas_header_text
from
blas
import
ldflags
,
blas_header_text
from
blas
import
blas_optdb
,
optdb
,
local_optimizer
,
EquilibriumOptimizer
from
blas
import
blas_optdb
,
optdb
,
local_optimizer
,
EquilibriumOptimizer
...
@@ -239,6 +241,8 @@ class CGer(BaseBLAS, Ger):
...
@@ -239,6 +241,8 @@ class CGer(BaseBLAS, Ger):
@local_optimizer
([
ger
,
ger_destructive
])
@local_optimizer
([
ger
,
ger_destructive
])
def
use_c_ger
(
node
):
def
use_c_ger
(
node
):
# Only float32 and float64 are supported for now.
# Only float32 and float64 are supported for now.
if
not
config
.
blas
.
ldflags
:
return
if
(
node
.
op
==
ger
and
if
(
node
.
op
==
ger
and
node
.
outputs
[
0
]
.
dtype
in
[
'float32'
,
'float64'
]):
node
.
outputs
[
0
]
.
dtype
in
[
'float32'
,
'float64'
]):
return
[
CGer
(
False
)(
*
node
.
inputs
)]
return
[
CGer
(
False
)(
*
node
.
inputs
)]
...
@@ -510,6 +514,8 @@ class CGemv(BaseBLAS, Gemv):
...
@@ -510,6 +514,8 @@ class CGemv(BaseBLAS, Gemv):
@local_optimizer
([
gemv_inplace
,
gemv_no_inplace
])
@local_optimizer
([
gemv_inplace
,
gemv_no_inplace
])
def
use_c_gemv
(
node
):
def
use_c_gemv
(
node
):
# Only float32 and float64 are supported for now.
# Only float32 and float64 are supported for now.
if
not
config
.
blas
.
ldflags
:
return
if
(
node
.
op
==
gemv_no_inplace
and
if
(
node
.
op
==
gemv_no_inplace
and
node
.
outputs
[
0
]
.
dtype
in
[
'float32'
,
'float64'
]):
node
.
outputs
[
0
]
.
dtype
in
[
'float32'
,
'float64'
]):
return
[
CGemv
(
inplace
=
False
)(
*
node
.
inputs
)]
return
[
CGemv
(
inplace
=
False
)(
*
node
.
inputs
)]
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论