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
1 change: 1 addition & 0 deletions .github/workflows/docs_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
-DAF_BUILD_CPU:BOOL=OFF -DAF_BUILD_CUDA:BOOL=OFF \
-DAF_BUILD_OPENCL:BOOL=OFF -DAF_BUILD_UNIFIED:BOOL=OFF \
-DAF_BUILD_EXAMPLES:BOOL=OFF -DBUILD_TESTING:BOOL=OFF \
-DBOOST_ROOT:PATH=${BOOST_ROOT_1_72_0} \
-DDOXYGEN_EXECUTABLE:FILEPATH=${GITHUB_WORKSPACE}/doxygen/bin/doxygen \
..

Expand Down
6 changes: 3 additions & 3 deletions CMakeModules/boost_package.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# The complete license agreement can be obtained at:
# http://arrayfire.com/licenses/BSD-3-Clause

find_package(Boost)
find_package(Boost 1.66 REQUIRED)

set(Boost_MIN_VER 107000)
set(Boost_MIN_VER_STR "1.70")
Expand Down Expand Up @@ -45,8 +45,8 @@ if(NOT
add_dependencies(Boost::boost boost_compute)

set_target_properties(Boost::boost PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIR};${source_dir}/include"
INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIR};${source_dir}/include"
INTERFACE_INCLUDE_DIRECTORIES "${source_dir}/include;${Boost_INCLUDE_DIR}"
INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${source_dir}/include;${Boost_INCLUDE_DIR}"
)
else()
if(NOT TARGET Boost::boost)
Expand Down
2 changes: 1 addition & 1 deletion CMakeModules/build_CLBlast.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ endif()
ExternalProject_Add(
CLBlast-ext
GIT_REPOSITORY https://github.com/cnugteren/CLBlast.git
GIT_TAG 1.5.0
GIT_TAG 1.5.1
PREFIX "${prefix}"
INSTALL_DIR "${prefix}"
UPDATE_COMMAND ""
Expand Down
6 changes: 0 additions & 6 deletions docs/doxygen.mk
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,6 @@ ALIASES += "convolve_t{2}=\1 \ast \2"
ALIASES += "set_eq{2}=\f$ \left\\{ \1 \ \Bigg\vert \ \2 \right\\} \f$"
ALIASES += "set_t{2}=\left\\\{ \1 \ \Bigg\vert \ \2 \right\\\}"

# This tag can be used to specify a number of word-keyword mappings (TCL only).
# A mapping has the form "name=value". For example adding "class=itcl::class"
# will allow you to use the command class in the itcl::class meaning.

TCL_SUBST =

# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
Expand Down
11 changes: 10 additions & 1 deletion src/api/c/handle.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,16 @@ af_array copyArray(const af_array in) {

template<typename T>
void releaseHandle(const af_array arr) {
detail::destroyArray(static_cast<detail::Array<T> *>(arr));
auto &Arr = getArray<T>(arr);
int old_device = detail::getActiveDeviceId();
int array_id = Arr.getDevId();
if (array_id != old_device) {
detail::setDevice(array_id);
detail::destroyArray(static_cast<detail::Array<T> *>(arr));
detail::setDevice(old_device);
} else {
detail::destroyArray(static_cast<detail::Array<T> *>(arr));
}
}

template<typename T>
Expand Down
1 change: 1 addition & 0 deletions src/backend/common/err_common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wattributes"
#pragma GCC diagnostic ignored "-Wparentheses"
#include <boost/stacktrace.hpp>
#pragma GCC diagnostic pop
#include <common/defines.hpp>
Expand Down
5 changes: 4 additions & 1 deletion src/backend/cpu/ParamIterator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class ParamIterator {
using value_type = T;
using pointer = T*;
using reference = T&;
using const_reference = const T&;
using iterator_category = std::forward_iterator_tag;

/// Creates a sentinel iterator. This is equivalent to the end iterator
Expand Down Expand Up @@ -76,7 +77,9 @@ class ParamIterator {
return *this;
}

const reference operator*() const noexcept { return *ptr; }
reference operator*() noexcept { return *ptr; }

const_reference operator*() const noexcept { return *ptr; }

const pointer operator->() const noexcept { return ptr; }

Expand Down