From 3f8e87a73dd6168b2ff4d5aeec9a9a937844181e Mon Sep 17 00:00:00 2001 From: weiguang cui Date: Sat, 6 Apr 2024 11:52:33 +0200 Subject: [PATCH] update Makefile --- CodingTutorialC++/Makefile | 8 ++++++-- Gemfile | 18 +++++++++--------- Gemfile.lock | 35 +++++++++++++++++++---------------- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/CodingTutorialC++/Makefile b/CodingTutorialC++/Makefile index 6dff677..1e5b53e 100644 --- a/CodingTutorialC++/Makefile +++ b/CodingTutorialC++/Makefile @@ -8,7 +8,7 @@ CXXFLAGS = -std=c++11 -Wall -fopenmp TARGET = ACO_practice # Source files -SRCS = overflow.cpp MainArgs.cpp +SRCS = overflow.cpp MainArgs.cpp openmp-example.cpp # Object files OBJS = $(SRCS:.cpp=.o) @@ -16,7 +16,11 @@ OBJS = $(SRCS:.cpp=.o) # Executables EXECS = overflow MainArgs openmp-example +OMP_NUM_THREADS=4 +export OMP_NUM_THREADS + all: $(TARGET) + ./openmp-example overflow: overflow.o $(CXX) $(CXXFLAGS) -o overflow overflow.o @@ -31,4 +35,4 @@ openmp-example: openmp-example.o $(CXX) $(CXXFLAGS) -c $< -o $@ clean: - $(RM) $(OBJS) $(TARGET) $(EXECS) \ No newline at end of file + $(RM) $(OBJS) $(TARGET) $(EXECS) diff --git a/Gemfile b/Gemfile index 23d74d0..3e9dbf4 100644 --- a/Gemfile +++ b/Gemfile @@ -8,13 +8,13 @@ source "https://rubygems.org" # This will help ensure the proper Jekyll version is running. # Happy Jekylling! # -gem "jekyll", "~> 4.2" +#gem "jekyll", "~> 4.2" -group :jekyll_plugins do - gem "jekyll-timeago", "~> 0.13.1" -end +#group :jekyll_plugins do +# gem "jekyll-timeago", "~> 0.13.1" +#end -# gem "jekyll", "~> 4.0.0" +#gem "jekyll", "~> 4.0.0" # This is the default theme for new Jekyll sites. You may change this to anything you like. gem "minima", "~> 2.5" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and @@ -27,10 +27,10 @@ end # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem # and associated library. -install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do - gem "tzinfo", "~> 1.2" - gem "tzinfo-data" -end +# install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do +# gem "tzinfo", "~> 1.2" +# gem "tzinfo-data" +# end # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform? diff --git a/Gemfile.lock b/Gemfile.lock index a7c00cf..057a100 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,20 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.6.1) + activesupport (7.1.3.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) + base64 (0.2.0) + bigdecimal (3.1.7) coffee-script (2.4.1) coffee-script-source execjs @@ -16,8 +22,10 @@ GEM colorator (1.1.0) commonmarker (0.23.10) concurrent-ruby (1.2.3) - dnsruby (1.71.0) + connection_pool (2.4.1) + dnsruby (1.72.0) simpleidn (~> 0.2.1) + drb (2.2.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) @@ -211,16 +219,17 @@ GEM jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) minitest (5.22.3) + mutex_m (0.2.0) net-http (0.4.1) uri - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.4) + public_suffix (5.0.5) racc (1.7.3) rb-fsevent (0.11.2) rb-inotify (0.10.1) @@ -241,13 +250,10 @@ GEM unf (~> 0.1.4) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) typhoeus (1.4.1) ethon (>= 0.9.0) - tzinfo (1.2.11) - thread_safe (~> 0.1) - tzinfo-data (1.2024.1) - tzinfo (>= 1.0.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.9.1) @@ -255,7 +261,6 @@ GEM uri (0.13.0) wdm (0.1.1) webrick (1.8.1) - zeitwerk (2.6.13) PLATFORMS x86_64-linux @@ -265,8 +270,6 @@ DEPENDENCIES jekyll-feed (~> 0.12) jekyll-relative-links minima (~> 2.5) - tzinfo (~> 1.2) - tzinfo-data wdm (~> 0.1.1) webrick (~> 1.8)