Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
fa8be9e3
Unverified
Commit
fa8be9e3
authored
Aug 06, 2025
by
Daniel Hiltgen
Committed by
GitHub
Aug 06, 2025
Browse files
clean up debugging (#11756)
parent
8a75e9ee
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
56 deletions
+0
-56
ml/backend/ggml/ggml.go
ml/backend/ggml/ggml.go
+0
-56
No files found.
ml/backend/ggml/ggml.go
View file @
fa8be9e3
...
@@ -239,12 +239,10 @@ func New(modelPath string, params ml.BackendParams) (ml.Backend, error) {
...
@@ -239,12 +239,10 @@ func New(modelPath string, params ml.BackendParams) (ml.Backend, error) {
createTensor
:=
func
(
t
tensor
,
bts
[]
*
C
.
struct_ggml_backend_buffer_type
,
layer
int
)
*
C
.
struct_ggml_tensor
{
createTensor
:=
func
(
t
tensor
,
bts
[]
*
C
.
struct_ggml_backend_buffer_type
,
layer
int
)
*
C
.
struct_ggml_tensor
{
for
_
,
bt
:=
range
bts
{
for
_
,
bt
:=
range
bts
{
if
_
,
ok
:=
ctxs
[
bt
];
!
ok
{
if
_
,
ok
:=
ctxs
[
bt
];
!
ok
{
// slog.Info("XXX before ggml_init")
ctxs
[
bt
]
=
C
.
ggml_init
(
C
.
struct_ggml_init_params
{
ctxs
[
bt
]
=
C
.
ggml_init
(
C
.
struct_ggml_init_params
{
mem_size
:
C
.
ggml_tensor_overhead
()
*
C
.
size_t
(
maxTensors
),
mem_size
:
C
.
ggml_tensor_overhead
()
*
C
.
size_t
(
maxTensors
),
no_alloc
:
true
,
no_alloc
:
true
,
})
})
// slog.Info("XXX after ggml_init")
}
}
targets
[
t
.
source
.
Name
]
=
append
(
targets
[
t
.
source
.
Name
],
t
.
target
)
targets
[
t
.
source
.
Name
]
=
append
(
targets
[
t
.
source
.
Name
],
t
.
target
)
...
@@ -543,8 +541,6 @@ func (b *Backend) NewContextSize(n int) ml.Context {
...
@@ -543,8 +541,6 @@ func (b *Backend) NewContextSize(n int) ml.Context {
var
allocatedBuffers
[]
*
C
.
struct_ggml_backend_buffer
var
allocatedBuffers
[]
*
C
.
struct_ggml_backend_buffer
// slog.Info("XXX before ggml_init")
// defer slog.Info("XXX after ggml_init")
return
&
Context
{
return
&
Context
{
b
:
b
,
b
:
b
,
maxGraphNodes
:
n
,
maxGraphNodes
:
n
,
...
@@ -1407,55 +1403,3 @@ func (c Context) FromBytes(dtype ml.DType, s []uint8, shape ...int) ml.Tensor {
...
@@ -1407,55 +1403,3 @@ func (c Context) FromBytes(dtype ml.DType, s []uint8, shape ...int) ml.Tensor {
return
t
return
t
}
}
// TODO - DRY this out with New if possible
func
newTestBackend
(
size
int
)
*
Backend
{
var
cpus
[]
*
C
.
struct_ggml_backend_device
for
_
,
d
:=
range
devices
()
{
switch
C
.
ggml_backend_dev_type
(
d
)
{
case
C
.
GGML_BACKEND_DEVICE_TYPE_CPU
:
if
len
(
cpus
)
==
0
{
// only the first cpu device should be used
cpus
=
append
(
cpus
,
d
)
break
}
}
}
var
schedBackends
[]
*
C
.
struct_ggml_backend
var
schedBufts
[]
*
C
.
struct_ggml_backend_buffer_type
b
:=
C
.
ggml_backend_dev_init
(
cpus
[
0
],
nil
)
bt
:=
C
.
ggml_backend_get_default_buffer_type
(
b
)
C
.
ggml_backend_cpu_set_n_threads
(
b
,
C
.
int
(
Threads
(
runtime
.
NumCPU
())))
// C.ggml_backend_cpu_set_n_threads(b, 1) // DEBUGGING
schedBackends
=
append
(
schedBackends
,
b
)
schedBufts
=
append
(
schedBufts
,
bt
)
return
&
Backend
{
meta
:
nil
,
sched
:
C
.
ggml_backend_sched_new
(
(
*
C
.
ggml_backend_t
)(
unsafe
.
Pointer
(
&
schedBackends
[
0
])),
(
*
C
.
ggml_backend_buffer_type_t
)(
unsafe
.
Pointer
(
&
schedBufts
[
0
])),
C
.
int
(
len
(
schedBackends
)),
C
.
size_t
(
max
(
8192
,
size
)),
false
,
false
,
),
input
:
bt
,
maxGraphNodes
:
max
(
8192
,
size
),
schedBackends
:
schedBackends
,
schedBufts
:
schedBufts
,
}
}
func
newTestContext
(
b
*
Backend
,
n
int
)
*
Context
{
n
=
max
(
8192
,
n
)
// slog.Info("XXX before ggml_init")
// defer slog.Info("XXX after ggml_init")
return
&
Context
{
b
:
b
,
maxGraphNodes
:
n
,
ctx
:
C
.
ggml_init
(
C
.
struct_ggml_init_params
{
mem_size
:
C
.
size_t
(
n
)
*
C
.
ggml_tensor_overhead
()
+
C
.
ggml_graph_overhead_custom
(
C
.
size_t
(
n
),
false
),
no_alloc
:
true
,
}),
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment