Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ On this page we provide a summary of the main API changes, new features and exam
- Rename `CeedCompositeOperatorCreate()` to `CeedOperatorCreateComposite()` for uniformity.
- Rename `CeedCompositeOperator*()` to `CeedOperatorComposite*()` for uniformity.
- Add `build_objects` parameter to `CeedOperatorLinearAssembleQFunctionBuildOrUpdateFallback` to allow for passing uninitialized vectors and restrictions
- Move JiT helper functions only required by SYCL backends to `ceed/jit-tools-deprecated.h`.
These functions will be removed when the SYCL backends are updated to reflect the improvements in the CUDA and HIP backends.

### New features

Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ $(libceed.so) : CEED_LDFLAGS += $(if $(DARWIN), -install_name @rpath/$(notdir $(
# ------------------------------------------------------------

# Interface and gallery
libceed.c := $(filter-out interface/ceed-cuda.c interface/ceed-hip.c interface/ceed-jit-source-root-$(if $(for_install),default,install).c, $(wildcard interface/ceed*.c backends/weak/*.c gallery/*.c))
libceed.c := $(filter-out interface/ceed-cuda.c interface/ceed-hip.c interface/ceed-jit-tools-deprecated.c interface/ceed-jit-source-root-$(if $(for_install),default,install).c, $(wildcard interface/ceed*.c backends/weak/*.c gallery/*.c))
gallery.c := $(wildcard gallery/*/ceed*.c)
libceed.c += $(gallery.c)
libceed.h := $(shell git ls-files 'include/**/*.h')
Expand Down Expand Up @@ -630,6 +630,7 @@ endif
ifneq ($(SYCL_LIB_DIR),)
PKG_LIBS += $(filter -fsycl -fno-sycl-id-queries-fit-in-int,$(SYCLFLAGS)) -lze_loader
LIBCEED_CONTAINS_CXX = 1
libceed.c += interface/ceed-jit-tools-deprecated.c
libceed.sycl += $(sycl-core.cpp) $(sycl-ref.cpp) $(sycl-shared.cpp) $(sycl-gen.cpp)
BACKENDS_MAKE += $(SYCL_BACKENDS)
endif
Expand Down Expand Up @@ -1025,7 +1026,7 @@ AUTOPEP8_OPTS += --in-place --aggressive --max-line-length 120

format.ch := $(filter-out include/ceedf.h $(wildcard tests/t*-f.h) $(wildcard examples/ceed/ex*-f.h), $(shell git ls-files '*.[ch]pp' '*.[ch]' '*.cu'))
format.py := $(filter-out tests/junit-xml/junit_xml/__init__.py, $(shell git ls-files '*.py'))
format.ot := $(filter-out doc/sphinx/source/CODE_OF_CONDUCT.md doc/sphinx/source/CONTRIBUTING.md, $(shell git ls-files '*.md' '*.f90'))
format.ot := $(filter-out doc/sphinx/source/CHANGELOG.md doc/sphinx/source/CODE_OF_CONDUCT.md doc/sphinx/source/CONTRIBUTING.md, $(shell git ls-files '*.md' '*.f90'))

format-c :
$(call quiet,CLANG_FORMAT) $(CLANG_FORMAT_OPTS) $(format.ch)
Expand Down
1 change: 1 addition & 0 deletions backends/sycl-gen/ceed-sycl-gen-operator-build.sycl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <ceed/backend.h>
#include <ceed/ceed.h>
#include <ceed/jit-source/sycl/sycl-types.h>
#include <ceed/jit-tools-deprecated.h>
#include <ceed/jit-tools.h>

#include <iostream>
Expand Down
1 change: 1 addition & 0 deletions backends/sycl-gen/ceed-sycl-gen-qfunction.sycl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <ceed/backend.h>
#include <ceed/ceed.h>
#include <ceed/jit-tools-deprecated.h>
#include <sycl/sycl.hpp>
#include <stdio.h>
#include <string.h>
Expand Down
1 change: 1 addition & 0 deletions backends/sycl-ref/ceed-sycl-ref-qfunction-load.sycl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <ceed/backend.h>
#include <ceed/ceed.h>
#include <ceed/jit-tools-deprecated.h>
#include <ceed/jit-tools.h>

#include <iostream>
Expand Down
1 change: 1 addition & 0 deletions backends/sycl-shared/ceed-sycl-shared-basis.sycl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <ceed/backend.h>
#include <ceed/ceed.h>
#include <ceed/jit-tools-deprecated.h>
#include <ceed/jit-tools.h>

#include <map>
Expand Down
1 change: 1 addition & 0 deletions backends/sycl/ceed-sycl-compile.sycl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include <ceed/backend.h>
#include <ceed/ceed.h>
#include <ceed/jit-tools-deprecated.h>
#include <ceed/jit-tools.h>
#include <level_zero/ze_api.h>

Expand Down
709 changes: 0 additions & 709 deletions doc/sphinx/source/CHANGELOG.md

This file was deleted.

1 change: 1 addition & 0 deletions doc/sphinx/source/CHANGELOG.md
1 change: 0 additions & 1 deletion include/ceed/backend.h
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,6 @@ CEED_EXTERN int CeedQFunctionGetNumArgs(CeedQFunction qf, CeedInt *num_input_fie
CEED_EXTERN int CeedQFunctionGetKernelName(CeedQFunction qf, const char **kernel_name);
CEED_EXTERN int CeedQFunctionGetName(CeedQFunction qf, const char **name);
CEED_EXTERN int CeedQFunctionGetSourcePath(CeedQFunction qf, const char **source_path);
CEED_EXTERN int CeedQFunctionLoadSourceToBuffer(CeedQFunction qf, const char **source_buffer);
CEED_EXTERN int CeedQFunctionGetUserFunction(CeedQFunction qf, CeedQFunctionUser *f);
CEED_EXTERN int CeedQFunctionGetContext(CeedQFunction qf, CeedQFunctionContext *ctx);
CEED_EXTERN int CeedQFunctionGetContextData(CeedQFunction qf, CeedMemType mem_type, void *data);
Expand Down
15 changes: 15 additions & 0 deletions include/ceed/jit-tools-deprecated.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/// Copyright (c) 2017-2026, Lawrence Livermore National Security, LLC and other CEED contributors.
/// All Rights Reserved. See the top-level LICENSE and NOTICE files for details.
///
/// SPDX-License-Identifier: BSD-2-Clause
///
/// This file is part of CEED: http://github.com/ceed

/// @file
/// Public header for JiT utility components of libCEED
#pragma once

#include <ceed.h>

CEED_EXTERN int CeedLoadSourceToBuffer(Ceed ceed, const char *source_file_path, char **buffer);
CEED_EXTERN int CeedQFunctionLoadSourceToBuffer(CeedQFunction qf, const char **source_buffer);
6 changes: 0 additions & 6 deletions include/ceed/jit-tools.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,5 @@
#include <ceed.h>

CEED_EXTERN int CeedCheckFilePath(Ceed ceed, const char *source_file_path, bool *is_valid);
CEED_EXTERN int CeedLoadSourceToBuffer(Ceed ceed, const char *source_file_path, char **buffer);
CEED_EXTERN int CeedLoadSourceAndInitializeBuffer(Ceed ceed, const char *source_file_path, CeedInt *num_file_paths, char ***file_paths,
char **buffer);
CEED_EXTERN int CeedLoadSourceToInitializedBuffer(Ceed ceed, const char *source_file_path, CeedInt *num_file_paths, char ***file_paths,
char **buffer);
CEED_EXTERN int CeedPathConcatenate(Ceed ceed, const char *base_file_path, const char *relative_file_path, char **new_file_path);
CEED_EXTERN int CeedGetJitRelativePath(const char *absolute_file_path, const char **relative_file_path);
CEED_EXTERN int CeedGetJitAbsolutePath(Ceed ceed, const char *relative_file_path, const char **absolute_file_path);
Loading
Loading