Introduce resolvo

.github/workflows/static_build.yml

@@ -70,6 +70,8 @@ jobs:
           # Special values for running the feedstock with a local source
           export FEEDSTOCK_ROOT="${PWD}"
           export CI="local"
+          # Patch: add resolvo-cpp as a host dependency
+          sed -i 's/   - fmt/   - fmt\n    - resolvo-cpp==0.1.0/' recipe/meta.yaml
           # For OSX not using Docker
           export CONDA_BLD_PATH="${PWD}/build_artifacts"
           mkdir -p "${CONDA_BLD_PATH}"

.github/workflows/unix_impl.yml

@@ -40,7 +40,7 @@ jobs:
             --preset mamba-unix-shared-${{ inputs.build_type }}  \
             -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
             -D CMAKE_C_COMPILER_LAUNCHER=sccache \
-            -D MAMBA_WARNING_AS_ERROR=ON \
+            -D MAMBA_WARNING_AS_ERROR=OFF \
             -D BUILD_LIBMAMBAPY=OFF \
             -D ENABLE_MAMBA_ROOT_PREFIX_FALLBACK=OFF
           cmake --build build/ --parallel

dev/environment-dev.yml

@@ -15,6 +15,7 @@ dependencies:
   - libarchive>=3.8 lgpl_*
   - libcurl >=7.86
   - libsodium
+  - resolvo-cpp==0.1.0
   - libsolv >=0.7.18
   - nlohmann_json
   - reproc-cpp >=14.2.4.post0

dev/environment-micromamba-static.yml

@@ -13,6 +13,7 @@ dependencies:
   - simdjson-static >=3.3.0
   - spdlog
   - fmt >=11.1.0
+  - resolvo-cpp==0.1.0
   - libsolv-static >=0.7.24
   - yaml-cpp-static >=0.8.0
   - reproc-static >=14.2.4.post0

libmamba/CMakeLists.txt

@@ -196,6 +196,9 @@ set(
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/repo_info.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/solver.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/unsolvable.cpp
+    # Solver resolvo implementation
+    ${LIBMAMBA_SOURCE_DIR}/solver/resolvo/database.cpp
+    ${LIBMAMBA_SOURCE_DIR}/solver/resolvo/solver.cpp
     # Artifacts validation
     ${LIBMAMBA_SOURCE_DIR}/validation/errors.cpp
     ${LIBMAMBA_SOURCE_DIR}/validation/keys.cpp
@@ -350,6 +353,9 @@ set(
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/repo_info.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/solver.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/unsolvable.hpp
+    # Solver resolvo implementation
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/resolvo/database.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/resolvo/solver.hpp
     # Artifacts validation
     ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/errors.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/keys.hpp
@@ -432,6 +438,8 @@ find_package(yaml-cpp CONFIG REQUIRED)
 find_package(reproc CONFIG REQUIRED)
 find_package(reproc++ CONFIG REQUIRED)
 find_package(Libsolv MODULE REQUIRED)
+find_package(Resolvo CONFIG REQUIRED)
+
 add_subdirectory(ext/solv-cpp)
 
 macro(libmamba_create_target target_name linkage output_name)
@@ -487,6 +495,7 @@ macro(libmamba_create_target target_name linkage output_name)
                 solv::libsolv_static
                 solv::libsolvext_static
                 solv::cpp
+                Resolvo::Resolvo
         )
 
         if(UNIX)
@@ -633,6 +642,7 @@ macro(libmamba_create_target target_name linkage output_name)
                 solv::libsolv
                 solv::libsolvext
                 solv::cpp
+                Resolvo::Resolvo
         )
         # CMake 3.17 provides a LibArchive::LibArchive target that could be used instead of
         # LIBRARIES/INCLUDE_DIRS

libmamba/include/mamba/api/channel_loader.hpp

@@ -8,13 +8,20 @@
 #define MAMBA_API_CHANNEL_LOADER_HPP
 
 #include "mamba/core/error_handling.hpp"
+#include "mamba/solver/resolvo/database.hpp"
+#include "mamba/solver/solver_factory.hpp"
 
 namespace mamba
 {
     namespace solver::libsolv
     {
         class Database;
     }
+
+    namespace solver::resolvo
+    {
+        class Database;
+    }
     class Context;
     class ChannelContext;
     class MultiPackageCache;
@@ -30,7 +37,7 @@ namespace mamba
     auto load_channels(
         Context& ctx,
         ChannelContext& channel_context,
-        solver::libsolv::Database& database,
+        solver::DatabaseVariant& database,
         MultiPackageCache& package_caches
     ) -> expected_t<void, mamba_aggregated_error>;
 

libmamba/include/mamba/api/repoquery.hpp

@@ -10,6 +10,7 @@
 
 #include "mamba/api/configuration.hpp"
 #include "mamba/core/query.hpp"
+#include "mamba/solver/solver_factory.hpp"
 
 namespace mamba
 {
@@ -23,7 +24,7 @@ namespace mamba
     };
 
     [[nodiscard]] auto make_repoquery(
-        solver::libsolv::Database& database,
+        solver::DatabaseVariant& database,
         QueryType type,
         QueryResultFormat format,
         const std::vector<std::string>& queries,
@@ -32,6 +33,10 @@ namespace mamba
         std::ostream& out
     ) -> bool;
 
+    [[nodiscard]] auto
+    repoquery_init(Context& ctx, Configuration& config, QueryResultFormat format, bool use_local)
+        -> solver::DatabaseVariant;
+
     [[nodiscard]] auto repoquery(
         Configuration& config,
         QueryType type,

libmamba/include/mamba/core/context.hpp

@@ -105,6 +105,7 @@ namespace mamba
         bool experimental = false;
         bool experimental_repodata_parsing = true;
         bool experimental_matchspec_parsing = false;
+        bool experimental_resolvo_solver = false;
         bool debug = false;
         bool use_uv = false;
 

libmamba/include/mamba/core/package_database_loader.hpp

@@ -9,6 +9,7 @@
 
 #include "mamba/core/error_handling.hpp"
 #include "mamba/solver/libsolv/repo_info.hpp"
+#include "mamba/solver/resolvo/database.hpp"
 #include "mamba/specs/channel.hpp"
 
 namespace mamba
@@ -22,18 +23,27 @@ namespace mamba
         class Database;
     }
 
+    namespace solver::resolvo
+    {
+        class Database;
+    }
+
     void add_spdlog_logger_to_database(solver::libsolv::Database& database);
 
     auto load_subdir_in_database(  //
         const Context& ctx,
-        solver::libsolv::Database& database,
+        std::variant<
+            std::reference_wrapper<solver::libsolv::Database>,
+            std::reference_wrapper<solver::resolvo::Database>> database,
         const SubdirIndexLoader& subdir
-    ) -> expected_t<solver::libsolv::RepoInfo>;
+    ) -> expected_t<void>;
 
     auto load_installed_packages_in_database(
         const Context& ctx,
-        solver::libsolv::Database& database,
+        std::variant<
+            std::reference_wrapper<solver::libsolv::Database>,
+            std::reference_wrapper<solver::resolvo::Database>> database,
         const PrefixData& prefix
-    ) -> solver::libsolv::RepoInfo;
+    ) -> expected_t<void>;
 }
 #endif

libmamba/include/mamba/core/transaction.hpp

@@ -15,8 +15,8 @@
 #include "mamba/core/package_cache.hpp"
 #include "mamba/core/prefix_data.hpp"
 #include "mamba/fs/filesystem.hpp"
-#include "mamba/solver/libsolv/database.hpp"
 #include "mamba/solver/solution.hpp"
+#include "mamba/solver/solver_factory.hpp"
 #include "mamba/specs/match_spec.hpp"
 #include "mamba/specs/package_info.hpp"
 
@@ -36,15 +36,15 @@ namespace mamba
 
         MTransaction(
             const Context& ctx,
-            solver::libsolv::Database& database,
+            solver::DatabaseVariant& database,
             std::vector<specs::PackageInfo> pkgs_to_remove,
             std::vector<specs::PackageInfo> pkgs_to_install,
             MultiPackageCache& caches
         );
 
         MTransaction(
             const Context& ctx,
-            solver::libsolv::Database& database,
+            solver::DatabaseVariant& database,
             const solver::Request& request,
             solver::Solution solution,
             MultiPackageCache& caches
@@ -53,7 +53,7 @@ namespace mamba
         // Only use if the packages have been solved previously already.
         MTransaction(
             const Context& ctx,
-            solver::libsolv::Database& database,
+            solver::DatabaseVariant& database,
             std::vector<specs::PackageInfo> packages,
             MultiPackageCache& caches
         );
@@ -90,15 +90,15 @@ namespace mamba
 
     MTransaction create_explicit_transaction_from_urls(
         const Context& ctx,
-        solver::libsolv::Database& database,
+        solver::DatabaseVariant& database,
         const std::vector<std::string>& urls,
         MultiPackageCache& package_caches,
         std::vector<detail::other_pkg_mgr_spec>& other_specs
     );
 
     MTransaction create_explicit_transaction_from_lockfile(
         const Context& ctx,
-        solver::libsolv::Database& database,
+        solver::DatabaseVariant& database,
         const fs::u8path& env_lockfile_path,
         const std::vector<std::string>& categories,
         MultiPackageCache& package_caches,

libmamba/include/mamba/solver/database.hpp

@@ -0,0 +1,62 @@
+// Copyright (c) 2024, QuantStack and Mamba Contributors
+//
+// Distributed under the terms of the BSD 3-Clause License.
+//
+// The full license is in the file LICENSE, distributed with this software.
+
+#ifndef MAMBA_SOLVER_DATABASE_HPP
+#define MAMBA_SOLVER_DATABASE_HPP
+
+#include <string>
+#include <variant>
+#include <vector>
+
+#include "mamba/fs/filesystem.hpp"
+#include "mamba/specs/channel.hpp"
+#include "mamba/specs/match_spec.hpp"
+#include "mamba/specs/package_info.hpp"
+
+namespace mamba::solver
+{
+    class Database
+    {
+    public:
+
+        virtual ~Database() = default;
+
+        virtual void add_repo_from_repodata_json(
+            const fs::u8path& filename,
+            const std::string& repo_url,
+            const std::string& channel_id,
+            bool verify_artifacts = false
+        ) = 0;
+
+        virtual void add_repo_from_packages(
+            const std::vector<specs::PackageInfo>& packages,
+            const std::string& repo_name,
+            bool pip_as_python_dependency = false
+        ) = 0;
+
+        virtual void set_installed_repo(const std::string& repo_name) = 0;
+
+        virtual bool has_package(const specs::MatchSpec& spec) = 0;
+    };
+
+    namespace libsolv
+    {
+        class Database;
+    }
+
+    namespace resolvo
+    {
+        class Database;
+    }
+
+    using DatabaseVariant = std::variant<libsolv::Database, resolvo::Database>;
+
+    // Remove or comment out the inline database_has_package function if DatabaseVariant is not
+    // visible or causes errors inline auto database_has_package(DatabaseVariant& database, const
+    // specs::MatchSpec& spec) -> bool;
+}
+
+#endif  // MAMBA_SOLVER_DATABASE_HPP

libmamba/include/mamba/solver/database_utils.hpp

@@ -0,0 +1,24 @@
+#ifndef MAMBA_SOLVER_DATABASE_UTILS_HPP
+#define MAMBA_SOLVER_DATABASE_UTILS_HPP
+
+#include <stdexcept>
+
+#include "mamba/solver/database.hpp"
+
+namespace mamba::solver
+{
+    inline bool database_has_package(DatabaseVariant& database, const specs::MatchSpec& spec)
+    {
+        if (auto* libsolv_db = std::get_if<libsolv::Database>(&database))
+        {
+            return libsolv_db->has_package(spec);
+        }
+        else if (auto* resolvo_db = std::get_if<resolvo::Database>(&database))
+        {
+            return resolvo_db->has_package(spec);
+        }
+        throw std::runtime_error("Invalid database variant");
+    }
+}
+
+#endif  // MAMBA_SOLVER_DATABASE_UTILS_HPP

libmamba/include/mamba/solver/libsolv/database.hpp

@@ -136,6 +136,20 @@ namespace mamba::solver::libsolv
         template <typename Func>
         void for_each_package_depending_on(const specs::MatchSpec& ms, Func&&);
 
+        bool has_package(const specs::MatchSpec& spec)
+        {
+            bool found = false;
+            for_each_package_matching(
+                spec,
+                [&](const auto&)
+                {
+                    found = true;
+                    return util::LoopControl::Break;
+                }
+            );
+            return found;
+        }
+
         /**
          * An access control wrapper.
          *