Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

conda-build: Adaptations for folly #1320

Merged
merged 4 commits into from
Feb 14, 2024
Merged

conda-build: Adaptations for folly #1320

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d29262
conda-build: Pin folly==2023.09.25.00
jjerphan Feb 13, 2024
be38754
Include cstdio since it is missing in folly
jjerphan Feb 13, 2024
f56d11c
github: Try using macos-12
jjerphan Feb 13, 2024
705936c
Revert "Include cstdio since it is missing in folly"
jjerphan Feb 13, 2024
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
6 changes: 5 additions & 1 deletion cpp/arcticdb/async/task_scheduler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
#include <arcticdb/async/base_task.hpp>
#include <arcticdb/entity/performance_tracing.hpp>

// Compilation fails on Mac if cstdio is not included prior to folly/Function.h due to a missing definition of memalign in folly/Memory.h
#ifdef __APPLE__
#include <cstdio>
#endif
#include <folly/executors/FutureExecutor.h>
#include <folly/executors/CPUThreadPoolExecutor.h>
#include <folly/executors/IOThreadPoolExecutor.h>
Expand Down Expand Up @@ -67,7 +71,7 @@
ARCTICDB_SAMPLE_THREAD();
func();
});

}
// we use a modern version of folly when consuming dependencies from conda
#ifdef ARCTICDB_USING_CONDA
Expand Down Expand Up @@ -101,7 +105,7 @@
void ensure_active_threads() {
SchedulerType::ensureActiveThreads();
}
};

Check warning on line 108 in cpp/arcticdb/async/task_scheduler.hpp

View workflow job for this annotation

GitHub Actions / Windows C++ Tests / compile (windows, windows-cl, win_amd64, C:/cpp_build, C:/vcpkg_packages, *.pdb, *.lib, *.ilk, *.... 

 'arcticdb::async::SchedulerWrapper<arcticdb::async::TaskScheduler::IOSchedulerType>': inherits 'folly::DefaultKeepAliveExecutor::folly::DefaultKeepAliveExecutor::keepAliveAcquire' via dominance

Check warning on line 108 in cpp/arcticdb/async/task_scheduler.hpp

View workflow job for this annotation

GitHub Actions / Windows C++ Tests / compile (windows, windows-cl, win_amd64, C:/cpp_build, C:/vcpkg_packages, *.pdb, *.lib, *.ilk, *.... 

 'arcticdb::async::SchedulerWrapper<arcticdb::async::TaskScheduler::IOSchedulerType>': inherits 'folly::DefaultKeepAliveExecutor::folly::DefaultKeepAliveExecutor::keepAliveRelease' via dominance

Check warning on line 108 in cpp/arcticdb/async/task_scheduler.hpp

View workflow job for this annotation

GitHub Actions / Windows C++ Tests / compile (windows, windows-cl, win_amd64, C:/cpp_build, C:/vcpkg_packages, *.pdb, *.lib, *.ilk, *.... 

 'arcticdb::async::SchedulerWrapper<arcticdb::async::TaskScheduler::IOSchedulerType>': inherits 'folly::DefaultKeepAliveExecutor::folly::DefaultKeepAliveExecutor::keepAliveAcquire' via dominance

Check warning on line 108 in cpp/arcticdb/async/task_scheduler.hpp

View workflow job for this annotation

GitHub Actions / Windows C++ Tests / compile (windows, windows-cl, win_amd64, C:/cpp_build, C:/vcpkg_packages, *.pdb, *.lib, *.ilk, *.... 

 'arcticdb::async::SchedulerWrapper<arcticdb::async::TaskScheduler::IOSchedulerType>': inherits 'folly::DefaultKeepAliveExecutor::folly::DefaultKeepAliveExecutor::keepAliveRelease' via dominance

Check warning on line 108 in cpp/arcticdb/async/task_scheduler.hpp

View workflow job for this annotation

GitHub Actions / Windows C++ Tests / compile (windows, windows-cl, win_amd64, C:/cpp_build, C:/vcpkg_packages, *.pdb, *.lib, *.ilk, *.... 

 'arcticdb::async::SchedulerWrapper<arcticdb::async::TaskScheduler::IOSchedulerType>': inherits 'folly::DefaultKeepAliveExecutor::folly::DefaultKeepAliveExecutor::keepAliveAcquire' via dominance

Check warning on line 108 in cpp/arcticdb/async/task_scheduler.hpp

View workflow job for this annotation

GitHub Actions / Windows C++ Tests / compile (windows, windows-cl, win_amd64, C:/cpp_build, C:/vcpkg_packages, *.pdb, *.lib, *.ilk, *.... 

 'arcticdb::async::SchedulerWrapper<arcticdb::async::TaskScheduler::IOSchedulerType>': inherits 'folly::DefaultKeepAliveExecutor::folly::DefaultKeepAliveExecutor::keepAliveRelease' via dominance

inline int64_t get_cgroup_value(const std::string& cgroup_file) {
if(const auto path = std::filesystem::path{fmt::format("/sys/fs/cgroup/{}",cgroup_file)}; std::filesystem::exists(path)){
Expand Down
2 changes: 1 addition & 1 deletion environment_unix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies:
# - rocksdb
# ArcticDB is currently incompatible with fmt 10
- fmt < 10
- folly
- folly==2023.09.25.00
# Vendored build dependencies (see `cpp/thirdparty` and `cpp/vcpkg.json`)
# Versions must be kept in sync
- xxhash==0.8.2
Expand Down
Loading