Fixes for Intel Docker image

dev-cafe · Aug 11, 2018 · 4477f16 · 4477f16
1 parent 9e074e7
commit 4477f16
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -24,8 +24,7 @@ variables:
             source /opt/intel/bin/compilervars.sh -arch intel64 -platform linux
         fi
         EOF
-        pip install --user pipenv --upgrade pip
-        pipenv install --three
+        pipenv install --python /usr/bin/python3
   report: &report
     run:
       name: Report

diff --git a/chapter-07/recipe-09/fortran-example/src/evolution/evolution.f90 b/chapter-07/recipe-09/fortran-example/src/evolution/evolution.f90
@@ -18,7 +18,7 @@ pure subroutine evolve(row, rule_binary)
     integer, intent(in) :: rule_binary(8)
     integer :: i
     integer :: left, center, right
-    integer :: ancestors
+    integer :: ancestry
     integer, allocatable :: new_row(:)
 
     allocate(new_row(size(row)))
@@ -31,8 +31,8 @@ pure subroutine evolve(row, rule_binary)
       if (left < 1) left = left + size(row)
       if (right > size(row)) right = right - size(row)
 
-      ancestors = compute_ancestors(row, left, center, right)
-      new_row(i) = rule_binary(ancestors)
+      ancestry = compute_ancestors(row, left, center, right)
+      new_row(i) = rule_binary(ancestry)
     end do
 
     row = new_row

diff --git a/chapter-08/recipe-02/cxx-example/external/upstream/boost/CMakeLists.txt b/chapter-08/recipe-02/cxx-example/external/upstream/boost/CMakeLists.txt
@@ -21,7 +21,11 @@ else()
     set(_toolset "clang")
     set(_cxx_std_flag "-std=c++11")
   elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-    set(_toolset "intel")
+    if(APPLE)
+      set(_toolset "intel-darwin")
+    else()
+      set(_toolset "intel-linux")
+    endif()
     set(_cxx_std_flag "-std=c++11")
   endif()
 
@@ -43,10 +47,6 @@ else()
     message(STATUS "  Libraries to be built: ${printout}")
   endif()
 
-  set(_user_config_jamfile "${PROJECT_BINARY_DIR}/user-config.jam")
-  file(WRITE "${_user_config_jamfile}" "using ${_toolset} : : ${CMAKE_CXX_COMPILER} : <cxxflags>\"${_cxx_std_flag}\" <linkflags>\"${_cxx_std_flag}\" ;")
-  set(_build_user_config_args "--user-config=${PROJECT_BINARY_DIR}/user-config.jam")
-
   include(ExternalProject)
   ExternalProject_Add(boost_external
     URL