Merge pull request #4 from kpeeters/master

Sync with upstream

Author: cbehan

CMakeLists.txt

@@ -51,6 +51,16 @@ else()
 	message(STATUS "Install directory set to ${CMAKE_INSTALL_PREFIX}")
 endif()
 
+install(
+  CODE
+  "
+  if (EXISTS \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2.1\")
+     message(FATAL_ERROR \"\nThe location of the Cadabra manual has changed since the last installation. Please remove the old files with 'make deduplicate'.\n\")
+  endif()
+  "
+  )
+ 
+
 # Include packaging logic.
 include(cmake/packaging.cmake)
 

libs/pybind11/CMakeLists.txt

@@ -119,17 +119,6 @@ if(NOT (CMAKE_VERSION VERSION_LESS 3.0))  # CMake >= 3.0
   target_link_libraries(embed INTERFACE pybind11::pybind11 $<BUILD_INTERFACE:${PYTHON_LIBRARIES}>)
 endif()
 
-if (NOT PYBIND_MASTER_PROJECT)
-  install(
-          CODE
-          "
-          if (EXISTS \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2.1\")
-            message(FATAL_ERROR \"The location of the Cadabra manual has changed since the last installation. Please remove the old files with make deduplicate.\")
-          endif()
-          "
-  )
-endif()
-
 if (PYBIND11_INSTALL)
   install(DIRECTORY ${PYBIND11_INCLUDE_DIR}/pybind11 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
   # GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".

tests/forms.cdb

@@ -11,6 +11,11 @@ def test01():
 
 test01()
 
+
+
+
+
+
 # A::Matrix;
 # A::DifferentialForm(degree=1);
 # F::DifferentialForm(degree=2);

tests/implicit.cdb

@@ -50,4 +50,25 @@ def test04():
 
 test04()
 
-    
+def test05():
+    __cdbkernel__=create_scope()
+    {a,b,c,d}::Indices(vector);
+    ex:=(A)_{a b} (B)_{b c} (C)_{c d};
+    combine(_);
+    tst:= (A B C)_{a d} - @(ex);
+    assert(tst==0)
+    print("Test 05 passed")
+
+test05()
+
+def test06():
+    __cdbkernel__=create_scope()
+    {a,b}::Indices(vector);
+    ex:=(A)_{a b} (B)_{b a};
+    combine(_);
+    tst:= (A B)_{b b} - @(ex);
+    assert(tst==0)
+    print("Test 06 passed")
+
+test06()
+