Improved extconf setup

Author: ankane

Rakefile

@@ -25,13 +25,4 @@ task :remove_ext do
   end
 end
 
-task :remove_obj do
-  Dir["ext/faiss/*.o"].each do |path|
-    File.unlink(path)
-  end
-end
-
-Rake::Task["build"].enhance [:remove_ext, :remove_obj]
-Rake::Task["compile"].enhance [:remove_obj]
-
-CLEAN.include("vendor/faiss/**/*.o")
+Rake::Task["build"].enhance [:remove_ext]

ext/faiss/extconf.rb

@@ -20,7 +20,7 @@
 $LDFLAGS += " -Wl,-undefined,dynamic_lookup" if RbConfig::CONFIG["host_os"] =~ /darwin/i
 
 $CXXFLAGS += " -std=c++17 $(optflags) -DFINTEGER=int"
-$CXXFLAGS += " -Wall -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable -Wno-unused-private-field -Wno-deprecated-declarations -Wno-sign-compare"
+$CXXFLAGS += " -Wall -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-sign-compare"
 
 # -march=native not supported with ARM Mac
 default_optflags = RbConfig::CONFIG["host_os"] =~ /darwin/i && RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i ? "" : " -march=native"
@@ -34,8 +34,7 @@
 vendor = File.expand_path("../../vendor/faiss", __dir__)
 
 $srcs = Dir["{#{ext},#{vendor}/faiss,#{vendor}/faiss/{impl,invlists,utils}/**}/*.{cpp}"]
-$objs = $srcs.map { |v| v.sub(/cpp\z/, "o") }
 abort "Faiss not found" unless find_header("faiss/Index.h", vendor)
-$VPATH << vendor
+$VPATH += $srcs.filter_map { |v| File.dirname(v) if v.start_with?(vendor) }.uniq
 
 create_makefile("faiss/ext")

ext/faiss/index_binary.cpp

@@ -9,7 +9,7 @@
 #include <rice/rice.hpp>
 
 #include "numo.hpp"
-#include "utils.h"
+#include "utils_rb.h"
 
 void init_index_binary(Rice::Module& m) {
   Rice::define_class_under<faiss::IndexBinary>(m, "IndexBinary")

ext/faiss/index.cpp ext/faiss/index_rb.cppext/faiss/index.cpp renamed to ext/faiss/index_rb.cpp

@@ -18,7 +18,7 @@
 #include <rice/stl.hpp>
 
 #include "numo.hpp"
-#include "utils.h"
+#include "utils_rb.h"
 
 namespace Rice::detail {
   template<>

ext/faiss/kmeans.cpp

@@ -5,7 +5,7 @@
 #include <rice/rice.hpp>
 
 #include "numo.hpp"
-#include "utils.h"
+#include "utils_rb.h"
 
 void init_kmeans(Rice::Module& m) {
   Rice::define_class_under<faiss::Clustering>(m, "Kmeans")

ext/faiss/pca_matrix.cpp

@@ -2,7 +2,7 @@
 #include <rice/rice.hpp>
 
 #include "numo.hpp"
-#include "utils.h"
+#include "utils_rb.h"
 
 void init_pca_matrix(Rice::Module& m) {
   Rice::define_class_under<faiss::PCAMatrix>(m, "PCAMatrix")

ext/faiss/product_quantizer.cpp

@@ -3,7 +3,7 @@
 #include <rice/rice.hpp>
 
 #include "numo.hpp"
-#include "utils.h"
+#include "utils_rb.h"
 
 void init_product_quantizer(Rice::Module& m) {
   Rice::define_class_under<faiss::ProductQuantizer>(m, "ProductQuantizer")

ext/faiss/utils.cpp ext/faiss/utils_rb.cppext/faiss/utils.cpp renamed to ext/faiss/utils_rb.cpp

@@ -1,7 +1,7 @@
 #include <rice/rice.hpp>
 
 #include "numo.hpp"
-#include "utils.h"
+#include "utils_rb.h"
 
 size_t check_shape(const numo::NArray& objects, size_t k) {
   auto ndim = objects.ndim();