Commit 8c063343 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'master' into collected-small-changes

parents 65807009 edda8a4d
Loading
Loading
Loading
Loading
+16 −10
Original line number Diff line number Diff line
if(PKG_KOKKOS)
  option(EXTERNAL_KOKKOS "Build against external kokkos library")
  if(EXTERNAL_KOKKOS)
    find_package(Kokkos REQUIRED)
    list(APPEND LAMMPS_LINK_LIBS Kokkos::kokkos)
  else()
    set(LAMMPS_LIB_KOKKOS_SRC_DIR ${LAMMPS_LIB_SOURCE_DIR}/kokkos)
    set(LAMMPS_LIB_KOKKOS_BIN_DIR ${LAMMPS_LIB_BINARY_DIR}/kokkos)
  add_definitions(-DLMP_KOKKOS)
    add_subdirectory(${LAMMPS_LIB_KOKKOS_SRC_DIR} ${LAMMPS_LIB_KOKKOS_BIN_DIR})
  
    set(Kokkos_INCLUDE_DIRS ${LAMMPS_LIB_KOKKOS_SRC_DIR}/core/src
@@ -10,6 +14,8 @@ if(PKG_KOKKOS)
                            ${LAMMPS_LIB_KOKKOS_BIN_DIR})
    include_directories(${Kokkos_INCLUDE_DIRS})
    list(APPEND LAMMPS_LINK_LIBS kokkos)
  endif()
  add_definitions(-DLMP_KOKKOS)

  set(KOKKOS_PKG_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/KOKKOS)
  set(KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/kokkos.cpp
+14.5 KiB
Loading image diff...
+15 −0
Original line number Diff line number Diff line
\documentclass[preview]{standalone}
\usepackage{varwidth}
\usepackage[utf8x]{inputenc}
\usepackage{amsmath, amssymb, graphics, setspace}

\begin{document}
\begin{varwidth}{50in}
  \begin{equation}
    || \vec{F} ||_{inf} 
    = {\rm max}\left(|F_1^1|, |F_1^2|, |F_1^3| \cdots, 
    |F_N^1|, |F_N^2|, |F_N^3|\right)
    \nonumber
  \end{equation}
\end{varwidth}
\end{document}
+9.25 KiB
Loading image diff...
+15 −0
Original line number Diff line number Diff line
\documentclass[preview]{standalone}
\usepackage{varwidth}
\usepackage[utf8x]{inputenc}
\usepackage{amsmath, amssymb, graphics, setspace}

\begin{document}
\begin{varwidth}{50in}
  \begin{equation}
    % \left| \left| \vec{F} \right| \right|_2 
    || \vec{F} ||_{max} 
    = {\rm max}\left(||\vec{F}_1||, \cdots, ||\vec{F}_N||\right)
    \nonumber
  \end{equation}
\end{varwidth}
\end{document}
Loading